diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2011-11-11 12:57:49 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2011-11-11 12:59:23 +1000 |
| commit | 2a03c9ca873bc47629f44a991bc1411ff9009c4c (patch) | |
| tree | 0dfee2080cffe09f4791dcb2746939a30bdae6cf /crawl-ref/source/mapmark.h | |
| parent | dc09296bda552fd809aa1b71ac7376096718ac2f (diff) | |
| download | crawl-ref-2a03c9ca873bc47629f44a991bc1411ff9009c4c.tar.gz crawl-ref-2a03c9ca873bc47629f44a991bc1411ff9009c4c.zip | |
Fix Phoenix attitude, marker removal (#4881).
This should retain the correct attitude across rebirth, and resolve any
issues with accessing the freed marker for information. It doesn't
resolve cross-level changes, though.
Diffstat (limited to 'crawl-ref/source/mapmark.h')
| -rw-r--r-- | crawl-ref/source/mapmark.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/mapmark.h b/crawl-ref/source/mapmark.h index 1c88d09b87..d98ec837ea 100644 --- a/crawl-ref/source/mapmark.h +++ b/crawl-ref/source/mapmark.h @@ -151,7 +151,8 @@ class map_phoenix_marker : public map_marker public: map_phoenix_marker (const coord_def& pos = coord_def(0, 0), int dur = 0, int mnum = 0, beh_type bh = BEH_HOSTILE, - god_type gd = GOD_NO_GOD, coord_def cp = coord_def(-1, -1) + mon_attitude_type at = ATT_HOSTILE, god_type gd = GOD_NO_GOD, + coord_def cp = coord_def(-1, -1) ); void write (writer &) const; @@ -165,6 +166,7 @@ public: int duration; int mon_num; beh_type behaviour; + mon_attitude_type attitude; god_type god; coord_def corpse_pos; }; |