diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-14 10:42:56 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-05-14 11:05:04 -0600 |
| commit | f79658290cfba25e9b1108889a64994f933d6e1f (patch) | |
| tree | 08847e99d719e89487540106eea654850868ddf6 /crawl-ref/source/player.h | |
| parent | edb40d360931499a73b11273a2af2a7e1d5fe4f4 (diff) | |
| download | crawl-ref-f79658290cfba25e9b1108889a64994f933d6e1f.tar.gz crawl-ref-f79658290cfba25e9b1108889a64994f933d6e1f.zip | |
Melt away lava orcs.
When you strip away the fundamentally broken tension mechanic, you're
left with a species that is essentially "Hill Orcs WITH FIRE". No effort
has come forward with code to fix either aspect of them despite the
length of time they've been around in trunk, and the code is littered
with a very large number of special cases in their presence.
Current lava orcs should be able to finish their games fine, but new
starts are disallowed.
There are a couple of bits I've left present but which will have no
function for the moment, mostly related to interactions with lava (as
there are a couple of species proposals floating around that benefit
from having those interactions).
Diffstat (limited to 'crawl-ref/source/player.h')
| -rw-r--r-- | crawl-ref/source/player.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index 60f1b8950f..3ea8723194 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -120,8 +120,10 @@ public: bool dead; // ... but pending revival int lives; int deaths; +#if TAG_MAJOR_VERSION == 34 float temperature; // For lava orcs. float temperature_last; +#endif FixedVector<uint8_t, NUM_SKILLS> skills; //!< skill level FixedVector<int8_t, NUM_SKILLS> train; //!< 0: disabled, 1: normal, 2: focus. @@ -333,7 +335,9 @@ public: bool redraw_title; bool redraw_hit_points; bool redraw_magic_points; +#if TAG_MAJOR_VERSION == 34 bool redraw_temperature; +#endif FixedVector<bool, NUM_STATS> redraw_stats; bool redraw_experience; bool redraw_armour_class; @@ -656,7 +660,9 @@ public: int silence_radius2() const; int liquefying_radius2() const; int umbra_radius2() const; +#if TAG_MAJOR_VERSION == 34 int heat_radius2() const; +#endif bool glows_naturally() const; bool petrifying() const; bool petrified() const; @@ -1035,6 +1041,7 @@ bool need_expiration_warning(coord_def p = you.pos()); void count_action(caction_type type, int subtype = 0); bool player_has_orb(); +#if TAG_MAJOR_VERSION == 34 enum temperature_level { TEMP_MIN = 1, // Minimum (and starting) temperature. Not any warmer than bare rock. @@ -1074,3 +1081,5 @@ int temperature_colour(int temp); string temperature_string(int temp); string temperature_text(int temp); #endif + +#endif |