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/player-equip.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/player-equip.cc')
| -rw-r--r-- | crawl-ref/source/player-equip.cc | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc index 3761579308..bdd9d8e438 100644 --- a/crawl-ref/source/player-equip.cc +++ b/crawl-ref/source/player-equip.cc @@ -517,10 +517,12 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs, bool unmeld) int mp = item.special - you.elapsed_time / POWER_DECAY; if (mp > 0) +#if TAG_MAJOR_VERSION == 34 if (you.species == SP_DJINNI) you.hp += mp; else - you.magic_points += mp; +#endif + you.magic_points += mp; if (get_real_mp(true) >= 50) mpr("You feel your magic capacity is already quite full."); @@ -857,6 +859,7 @@ static void _unequip_weapon_effect(item_def& item, bool showMsgs, bool meld) else if (item.base_type == OBJ_STAVES && item.sub_type == STAFF_POWER) { int mp = you.magic_points; +#if TAG_MAJOR_VERSION == 34 if (you.species == SP_DJINNI) { mp = you.hp; @@ -868,6 +871,10 @@ static void _unequip_weapon_effect(item_def& item, bool showMsgs, bool meld) calc_mp(); mp -= you.magic_points; } +#else + calc_mp(); + mp -= you.magic_points; +#endif // Store the MP in case you'll re-wield quickly. item.special = mp + you.elapsed_time / POWER_DECAY; @@ -984,7 +991,11 @@ static void _equip_armour_effect(item_def& arm, bool unmeld) if (!unmeld && you.spirit_shield() < 2) { dec_mp(you.magic_points); - if (you.species == SP_DJINNI || you.species == SP_VINE_STALKER) + if ( +#if TAG_MAJOR_VERSION == 34 + you.species == SP_DJINNI || +#endif + you.species == SP_VINE_STALKER) mpr("You feel the presence of a powerless spirit."); else mpr("You feel your power drawn to a protective spirit."); @@ -1382,7 +1393,11 @@ static void _equip_jewellery_effect(item_def &item, bool unmeld) if (you.spirit_shield() < 2 && !unmeld) { dec_mp(you.magic_points); - if (you.species == SP_DJINNI || you.species == SP_VINE_STALKER) + if ( +#if TAG_MAJOR_VERSION == 34 + you.species == SP_DJINNI || +#endif + you.species == SP_VINE_STALKER) mpr("You feel the presence of a powerless spirit."); else mpr("You feel your power drawn to a protective spirit."); |