Mercurial > mm7

comparison Player.cpp @ 999:dcdfbb6eede9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 14 May 2013 17:38:14 +0600
parents e4383e6dfbef 5876a9cafa3e
children e865f349aa41 c45d51b3f4f4
comparison
equal deleted inserted replaced
998:e4383e6dfbef 999:dcdfbb6eede9
3271 unsigned int Player::GetExperienceDisplayColor() 3271 unsigned int Player::GetExperienceDisplayColor()
3272 { 3272 {
3273 unsigned int result; // eax@2 3273 unsigned int result; // eax@2
3274 3274
3275 if ( CanTrainToNextLevel() ) 3275 if ( CanTrainToNextLevel() )
3276 result = TargetColor(0, 0xFFu, 0); 3276 result = ui_character_bonus_text_color;
3277 else 3277 else
3278 result = 0; 3278 result = ui_character_default_text_color;
3279 return result; 3279 return result;
3280 } 3280 }
3281 3281
3282 //----- (0048D4B3) -------------------------------------------------------- 3282 //----- (0048D4B3) --------------------------------------------------------
3283 int Player::CalculateIncommingDamage(int resistance, signed int type) 3283 int Player::CalculateIncommingDamage(int resistance, signed int type)