diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-28 03:23:20 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 03:23:49 +0200 |
| commit | 42993c7a02bf24d02280df06c7140851e8cabb1a (patch) | |
| tree | 06e615a5e52bcdb3adaacb8f8b6647822f15908b /crawl-ref/source/food.h | |
| parent | ba45822b41b6e70911ecd7a59a4e4f6fca56d0d1 (diff) | |
| parent | 536f84b0a61318597e2980852e89e9a41d2dedb4 (diff) | |
| download | crawl-ref-42993c7a02bf24d02280df06c7140851e8cabb1a.tar.gz crawl-ref-42993c7a02bf24d02280df06c7140851e8cabb1a.zip | |
Merge branch 'master' into djinn
Diffstat (limited to 'crawl-ref/source/food.h')
| -rw-r--r-- | crawl-ref/source/food.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/crawl-ref/source/food.h b/crawl-ref/source/food.h index 04b5e9e2a9..28a6e67058 100644 --- a/crawl-ref/source/food.h +++ b/crawl-ref/source/food.h @@ -7,10 +7,19 @@ #ifndef FOOD_H #define FOOD_H -#define BERSERK_NUTRITION 700 -#define HUNGER_STARVING 1000 -#define HUNGER_DEFAULT 6000 -#define HUNGER_MAXIMUM 12000 +#define BERSERK_NUTRITION 700 + +#define HUNGER_STARVING 1000 +#define HUNGER_NEAR_STARVING 1533 +#define HUNGER_VERY_HUNGRY 2066 +#define HUNGER_HUNGRY 2600 +#define HUNGER_SATIATED 7000 +#define HUNGER_FULL 9000 +#define HUNGER_VERY_FULL 11000 +#define HUNGER_ENGORGED 40000 + +#define HUNGER_DEFAULT 6000 +#define HUNGER_MAXIMUM 12000 int count_corpses_in_pack(bool blood_only = false); bool butchery(int which_corpse = -1, bool bottle_blood = false); @@ -46,7 +55,7 @@ int eat_from_floor(bool skip_chunks = true); bool eat_from_inventory(); int prompt_eat_chunks(bool only_auto = false); -bool food_change(bool suppress_message = false); +bool food_change(bool initial = false); void eat_inventory_item(int which_inventory_slot); bool prompt_eat_inventory_item(int slot = -1); @@ -63,7 +72,6 @@ bool you_foodless(bool can_eat = false); void handle_starvation(); string hunger_cost_string(const int hunger); -void end_nausea(); maybe_bool drop_spoiled_chunks(int weight_needed, bool whole_slot = false); #endif |