diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:26:24 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-12-29 08:26:24 +0530 |
| commit | 22c9c1dd3fe93c8ccab01eec647fb002877018f8 (patch) | |
| tree | 61647db7597a0c8b9055bfdba86ee1ffcaa5fb10 /crawl-ref/source/player.h | |
| parent | da206768a436941bf7acfc67f005a518fb90ca7e (diff) | |
| download | crawl-ref-22c9c1dd3fe93c8ccab01eec647fb002877018f8.tar.gz crawl-ref-22c9c1dd3fe93c8ccab01eec647fb002877018f8.zip | |
Merfolk (water/ice) elementalists join the Shoals guard.
Diffstat (limited to 'crawl-ref/source/player.h')
| -rw-r--r-- | crawl-ref/source/player.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index ee34bd703e..09b66c2053 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -464,6 +464,7 @@ public: int res_poison() const; int res_rotting() const; int res_asphyx() const; + int res_water_drowning() const; int res_sticky_flame() const; int res_holy_energy(const actor *) const; int res_negative_energy() const; @@ -513,6 +514,10 @@ public: bool do_shaft(); + void apply_location_effects(const coord_def &oldpos, + killer_type killer = KILL_NONE, + int killernum = -1); + //////////////////////////////////////////////////////////////// PlaceInfo& get_place_info() const ; // Current place info |