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/delay.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/delay.cc')
-rw-r--r-- | crawl-ref/source/delay.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index db56f6c483..daf25af4fb 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -41,7 +41,6 @@ #include "message.h" #include "misc.h" #include "mon-behv.h" -#include "mon-stuff.h" #include "mon-util.h" #include "notes.h" #include "ouch.h" @@ -59,6 +58,7 @@ #include "state.h" #include "stuff.h" #include "env.h" +#include "teleport.h" #include "transform.h" #include "traps.h" #include "travel.h" @@ -978,7 +978,7 @@ static void _finish_delay(const delay_queue_item &delay) if (monster* m = monster_at(pass)) { // One square, a few squares, anywhere... - if (!shift_monster(m) && !monster_blink(m, true)) + if (!m->shift() && !monster_blink(m, true)) monster_teleport(m, true, true); // Might still fail. if (monster_at(pass)) |