diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-19 01:19:56 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-19 01:19:56 +0000 |
commit | 725cb5b4d5a3ade5c5e7b04a6210cedc839c2bdd (patch) | |
tree | d2644ce5f13e7ab649b27b49f7bdcde18802a6b1 /crawl-ref/source/food.cc | |
parent | 1a36197574afe860feff7208cd883770a5d28946 (diff) | |
download | crawl-ref-725cb5b4d5a3ade5c5e7b04a6210cedc839c2bdd.tar.gz crawl-ref-725cb5b4d5a3ade5c5e7b04a6210cedc839c2bdd.zip |
Added new commands "re-do previous command" (bound to `) and "repeat
next command" (bound to 0). Though this is just an interface change,
it changes code in the core input processing function (input() in acr.cc),
and also messes around with the input buffer, so it could probably do
with more testing before merging it into the 0.3 branch.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2137 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r-- | crawl-ref/source/food.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index 260100732d..f2b8301a46 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -46,6 +46,7 @@ #include "religion.h" #include "skills2.h" #include "spells2.h" +#include "state.h" #include "stuff.h" #include "transfor.h" #include "tutorial.h" @@ -490,19 +491,23 @@ bool eat_food(bool run_hook) if (you.is_undead == US_UNDEAD) { mpr("You can't eat."); + crawl_state.zero_turns_taken(); return (false); } if (you.hunger >= 11000) { mpr("You're too full to eat anything."); + crawl_state.zero_turns_taken(); return (false); } // If user hook ran, we don't know whether something // was eaten or not... if (run_hook && userdef_eat_food()) + { return (false); + } if (igrd[you.x_pos][you.y_pos] != NON_ITEM) { |