summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godcompanions.cc
diff options
context:
space:
mode:
authorShmuale Mark <shm.mark@gmail.com>2014-06-19 16:05:04 -0400
committerShmuale Mark <shm.mark@gmail.com>2014-06-22 10:03:45 -0400
commit465957cba490a2a9d5444a64523572a90cfb837f (patch)
tree536c94ce0702e60217120aa2bb27325aff1b8f2d /crawl-ref/source/godcompanions.cc
parent393eda0d444702a7eda580e6c363bbdcaba8d54e (diff)
downloadcrawl-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/godcompanions.cc')
-rw-r--r--crawl-ref/source/godcompanions.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index 15b2cb71b2..466d8ac02c 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -10,7 +10,7 @@
#include "godcompanions.h"
#include "actor.h"
-#include "mon-stuff.h"
+#include "mon-message.h"
#include "mon-util.h"
#include "religion.h"
#include "stuff.h"
@@ -148,7 +148,7 @@ bool recall_offlevel_ally(mid_t mid)
// Note: these are auts, not turns, thus healing is 10 times as fast as
// for other monsters, confusion goes away after a single turn, etc.
- mons->heal(div_rand_round(turns * mons_off_level_regen_rate(mons), 100));
+ mons->heal(div_rand_round(turns * mons->off_level_regen_rate(), 100));
if (turns >= 10 && mons->alive())
{