# HG changeset patch
# User Ritor1
# Date 1361243656 -21600
# Node ID 055cea8660e5521f9fe382121c531499dc85a04d
# Parent  ada52edca264a4ccc3f74a41b52cbce852908f8d# Parent  27670273a6ffaf4ddaa4a09857ae4d7c08b131e5
Слияние

diff -r 27670273a6ff -r 055cea8660e5 Player.cpp
diff -r 27670273a6ff -r 055cea8660e5 Player.h
--- 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();
diff -r 27670273a6ff -r 055cea8660e5 mm7_4.cpp