diff options
| author | wheals <shm.mark@gmail.com> | 2014-02-12 18:59:28 -0500 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-02-24 23:50:41 -0500 |
| commit | 474977d740c070c7240df71e69437b8c955fe5b0 (patch) | |
| tree | c29b2dadefb3b01367e3689c3ee35705edc25a53 /crawl-ref/source/skills2.cc | |
| parent | 2228498b1c13e8181272757c7e3971bbce30689c (diff) | |
| download | crawl-ref-474977d740c070c7240df71e69437b8c955fe5b0.tar.gz crawl-ref-474977d740c070c7240df71e69437b8c955fe5b0.zip | |
Remove djinn.
Djinn games can't be started (hopefully including using the rcfile),
and djinn code should be removed on save-compat bump.
Also, schedule a few SE things to be removed.
Diffstat (limited to 'crawl-ref/source/skills2.cc')
| -rw-r--r-- | crawl-ref/source/skills2.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index 03c4d1f838..5c5dc2e28d 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -214,7 +214,9 @@ static string _stk_walker() { return Skill_Species == SP_NAGA ? "Slider" : Skill_Species == SP_TENGU ? "Glider" : +#if TAG_MAJOR_VERSION == 34 Skill_Species == SP_DJINNI ? "Floater" : +#endif Skill_Species == SP_OCTOPODE ? "Wriggler" : Skill_Species == SP_VINE_STALKER ? "Stalker" : "Walker"; @@ -489,8 +491,10 @@ void calc_hp() { int oldhp = you.hp, oldmax = you.hp_max; you.hp_max = get_real_hp(true, false); +#if TAG_MAJOR_VERSION == 34 if (you.species == SP_DJINNI) you.hp_max += get_real_mp(true); +#endif deflate_hp(you.hp_max, false); if (oldhp != you.hp || oldmax != you.hp_max) dprf("HP changed: %d/%d -> %d/%d", oldhp, oldmax, you.hp, you.hp_max); @@ -498,11 +502,13 @@ void calc_hp() void calc_mp() { +#if TAG_MAJOR_VERSION == 34 if (you.species == SP_DJINNI) { you.magic_points = you.max_magic_points = 0; return calc_hp(); } +#endif you.max_magic_points = get_real_mp(true); you.magic_points = min(you.magic_points, you.max_magic_points); |