Mercurial > mm7

changeset 298:055cea8660e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 19 Feb 2013 09:14:16 +0600
parents ada52edca264 (diff) 27670273a6ff (current diff)
children b0db84628733
files Player.cpp mm7_4.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Player.h	Tue Feb 19 01:23:04 2013 +0400
+++ b/Player.h	Tue Feb 19 09:14:16 2013 +0600
@@ -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();