diff Party.h @ 611:7bae884b7cd0

Слияние
author Ritor1
date Wed, 06 Mar 2013 20:16:06 +0600
parents 8ef867ae88b9
children 735dab8d3c9a
line wrap: on
line diff
--- a/Party.h	Wed Mar 06 20:15:47 2013 +0600
+++ b/Party.h	Wed Mar 06 20:16:06 2013 +0600
@@ -180,9 +180,9 @@
   
   static void SetGold(unsigned int uNumGold);
   static void TakeGold(unsigned int uNumGold);
-  static __int16 SetFood(unsigned int uNumFood);
+  static void SetFood(unsigned int uNumFood);
   static void TakeFood(unsigned int uNumFood);
-  static __int16 GiveFood(unsigned int _this);
+  static void GiveFood(unsigned int _this);
 
   inline bool WizardEyeActive()      {return pPartyBuffs[PARTY_BUFF_WIZARD_EYE].uExpireTime > 0;}
   inline int  WizardEyeSkillLevel()  {return pPartyBuffs[PARTY_BUFF_WIZARD_EYE].uSkill;}