Mercurial > mm7
comparison Player.cpp @ 995:5876a9cafa3e
Various UIs, autonotes title fixed
author | Nomad |
---|---|
date | Tue, 14 May 2013 14:03:07 +0200 |
parents | 3431f6abc786 |
children | dcdfbb6eede9 |
comparison
equal
deleted
inserted
replaced
994:3431f6abc786 | 995:5876a9cafa3e |
---|---|
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 = ui_color_text_bonus; | 3276 result = ui_character_bonus_text_color; |
3277 else | 3277 else |
3278 result = ui_color_text_default; | 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) |