Mercurial > mm7

diff Player.cpp @ 331:72de4ad353c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 19 Feb 2013 22:37:58 +0600
parents 2503214e5258 b0db84628733
children 405d0c4dd1b3
line wrap: on
line diff
--- a/Player.cpp	Tue Feb 19 22:37:39 2013 +0600
+++ b/Player.cpp	Tue Feb 19 22:37:58 2013 +0600
@@ -6818,18 +6818,18 @@
 }
 
 //----- (004907E7) --------------------------------------------------------
-__int16 Player::GetStatColor(unsigned int uStat)
+unsigned int Player::GetStatColor(int uStat)
 {
   __int16 uWhite; // si@1
   int attribute_value; // edx@1
-  unsigned __int8 pBaseValue; // of@1
+  unsigned __int8 pBaseAttrValue; // of@1
   __int16 uGreen; // [sp+8h] [bp-8h]@1
   __int16 uRed; // [sp+Ch] [bp-4h]@1
 
   uRed = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0x23u, 0);
   uGreen = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0);
   uWhite = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu);
-  pBaseValue = StatTable[GetRace()][uStat].uBaseValue;
+  pBaseAttrValue = StatTable[GetRace()][uStat].uBaseValue;
 
   switch (uStat)
   {
@@ -6842,9 +6842,9 @@
     case 6:  attribute_value = uLuck;         break;
   };
 
-  if ( attribute_value == pBaseValue )
+  if ( attribute_value == pBaseAttrValue )
     return uWhite;
-  else if ( attribute_value > pBaseValue )
+  else if ( attribute_value > pBaseAttrValue )
     return uGreen;
   else
     return uRed;