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/food.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/food.cc')
| -rw-r--r-- | crawl-ref/source/food.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index a4e24e9d8e..e2326fa056 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -79,7 +79,7 @@ void make_hungry(int hunger_amount, bool suppress_msg, you.hunger_state = HS_SATIATED; return; } - +#if TAG_MAJOR_VERSION == 34 // Lich/tree form djinn don't get exempted from food costs: infinite // healing from channeling would be just too good. if (you.species == SP_DJINNI) @@ -90,6 +90,7 @@ void make_hungry(int hunger_amount, bool suppress_msg, contaminate_player(hunger_amount * 4 / 3, true); return; } +#endif if (you_foodless()) return; @@ -149,7 +150,9 @@ void set_hunger(int new_hunger_level, bool suppress_msg) bool you_foodless(bool can_eat) { return you.is_undead == US_UNDEAD +#if TAG_MAJOR_VERSION == 34 || you.species == SP_DJINNI && !can_eat +#endif || you.form == TRAN_FUNGUS || you.form == TRAN_TREE || you.form == TRAN_WISP; @@ -158,7 +161,10 @@ bool you_foodless(bool can_eat) bool you_foodless_normally() { return you.is_undead == US_UNDEAD && you.form != TRAN_LICH - || you.species == SP_DJINNI; +#if TAG_MAJOR_VERSION == 34 + || you.species == SP_DJINNI +#endif + ; } /** @@ -2142,7 +2148,11 @@ bool is_preferred_food(const item_def &food) return is_blood_potion(food); if (food.base_type == OBJ_POTIONS && food.sub_type == POT_PORRIDGE - && item_type_known(food) && you.species != SP_DJINNI) + && item_type_known(food) +#if TAG_MAJOR_VERSION == 34 + && you.species != SP_DJINNI +#endif + ) { return !player_mutation_level(MUT_CARNIVOROUS); } |