summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mapmark.h
diff options
context:
space:
mode:
authorJude Brown <bookofjude@users.sourceforge.net>2011-11-10 21:03:23 +1000
committerJude Brown <bookofjude@users.sourceforge.net>2011-11-10 21:43:28 +1000
commit23e41a57533d774781cb90f5d19b0d7c206819cb (patch)
tree64a0fa8bc7b2ae8d107e8379632b1b020b517f7d /crawl-ref/source/mapmark.h
parentb954c760b03d48cfde8a7470bdc89fe1c76c56be (diff)
downloadcrawl-ref-23e41a57533d774781cb90f5d19b0d7c206819cb.tar.gz
crawl-ref-23e41a57533d774781cb90f5d19b0d7c206819cb.zip
Finish Phoenixes!
They'll now resurrect themselves. Hopefully, there aren't too many bugs, but it at least seems to work all of the time now, rather than just simply when in LOS.
Diffstat (limited to 'crawl-ref/source/mapmark.h')
-rw-r--r--crawl-ref/source/mapmark.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/mapmark.h b/crawl-ref/source/mapmark.h
index 3b75f8d7b6..1c88d09b87 100644
--- a/crawl-ref/source/mapmark.h
+++ b/crawl-ref/source/mapmark.h
@@ -150,7 +150,7 @@ class map_phoenix_marker : public map_marker
{
public:
map_phoenix_marker (const coord_def& pos = coord_def(0, 0),
- int tst = 0, int tso = 0, beh_type bh = BEH_HOSTILE,
+ int dur = 0, int mnum = 0, beh_type bh = BEH_HOSTILE,
god_type gd = GOD_NO_GOD, coord_def cp = coord_def(-1, -1)
);
@@ -162,8 +162,8 @@ public:
static map_marker *read(reader &, map_marker_type);
public:
- int turn_start;
- int turn_stop;
+ int duration;
+ int mon_num;
beh_type behaviour;
god_type god;
coord_def corpse_pos;