Integrated travel patch as of 20060727

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 12 insertions, 1 deletions

diff --git a/trunk/source/food.h b/trunk/source/food.h
index 49b072a54f..1c8e5f5a74 100644
--- a/trunk/source/food.h
+++ b/trunk/source/food.h
@@ -24,7 +24,7 @@ bool butchery(void);
 /* ***********************************************************************
  * called from: acr
  * *********************************************************************** */
-void eat_food(void);
+bool eat_food(bool run_hook = true);
 
 
 // last updated 19jun2000 {dlb}
@@ -54,4 +54,15 @@ void set_hunger(int new_hunger_level, bool suppress_msg);
  * *********************************************************************** */
 void weapon_switch( int targ );
 
+bool can_ingest(int what_isit, int kindof_thing, bool suppress_msg, 
+                bool reqid = false, bool check_hunger = true);
+
+void eat_floor_item(int item_link);
+
+bool eat_from_floor(void);
+
+void eat_from_inventory(int which_inventory_slot);
+
+bool prompt_eat_from_inventory(void);
+
 #endif