diff Player.h @ 304:f16ac5e65438

Merge
author Nomad
date Tue, 19 Feb 2013 15:40:11 +0200
parents 3dcc9d945eeb ada52edca264
children f0f66f690777
line wrap: on
line diff
--- a/Player.h	Tue Feb 19 15:39:50 2013 +0200
+++ b/Player.h	Tue Feb 19 15:40:11 2013 +0200
@@ -514,7 +514,7 @@
   void DecreaseAttribute(int eAttribute);
   int IncreaseAttribute(int eAttribute);
   void Player::Zero();
-  __int16 GetStatColor(unsigned int uStat);
+  unsigned int GetStatColor(int uStat);
   bool DiscardConditionIfLastsLongerThan(unsigned int uCondition, unsigned __int64 uTime);
   int _490EEE(ItemGen *pItem, int a3, int a4, int a5);
   int GetBodybuilding();