diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 16:05:04 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-22 10:03:45 -0400 |
| commit | 465957cba490a2a9d5444a64523572a90cfb837f (patch) | |
| tree | 536c94ce0702e60217120aa2bb27325aff1b8f2d /crawl-ref/source/melee_attack.cc | |
| parent | 393eda0d444702a7eda580e6c363bbdcaba8d54e (diff) | |
| download | crawl-ref-465957cba490a2a9d5444a64523572a90cfb837f.tar.gz crawl-ref-465957cba490a2a9d5444a64523572a90cfb837f.zip | |
The great mon-stuff migration.
A good deal of functions move to the two new files, mon-poly and
mon-message. Of the others, some go to where they are used, some to
mon-util, and a few are made member methods of monster.
This probably breaks Xcode compilation, and I'm not able to test
the changes I made to MSVC that will (hopefully) keep it working.
Diffstat (limited to 'crawl-ref/source/melee_attack.cc')
| -rw-r--r-- | crawl-ref/source/melee_attack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index f04421c598..7a2c868417 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -45,9 +45,9 @@ #include "mon-clone.h" #include "mon-death.h" #include "mon-place.h" +#include "mon-poly.h" #include "terrain.h" #include "mgen_data.h" -#include "mon-stuff.h" #include "mon-util.h" #include "mutation.h" #include "options.h" @@ -1354,7 +1354,7 @@ bool melee_attack::player_aux_apply(unarmed_attack_type atk) { mprf("%s is splashed with acid.", defender->name(DESC_THE).c_str()); - splash_monster_with_acid(defender->as_monster(), &you); + defender->as_monster()->splash_with_acid(&you); } // TODO: remove this? Unarmed poison attacks? @@ -2745,7 +2745,7 @@ void melee_attack::splash_defender_with_acid(int strength) special_damage += roll_dice(2, 4); if (defender_visible) mprf("%s is splashed with acid.", defender->name(DESC_THE).c_str()); - splash_monster_with_acid(defender->as_monster(), attacker); + defender->as_monster()->splash_with_acid(attacker); } } |