Merge fix

zone/client.h

@@ -1351,7 +1351,7 @@ private:
 	uint32 GetClassHPFactor();
 	void DoHPRegen();
 	void DoManaRegen();
-	void DoStaminaUpdate();
+	void DoStaminaHungerUpdate();
 	void CalcRestState();
 
 	uint32 pLastUpdate;
@@ -1459,6 +1459,7 @@ private:
 	Timer camp_timer;
 	Timer process_timer;
 	Timer stamina_timer;
+	Timer consume_food_timer;
 	Timer zoneinpacket_timer;
 	Timer linkdead_timer;
 	Timer dead_timer;