Mercurial > mm7
comparison UI/UiGame.cpp @ 1762:2b8b748a222a
Слияние
author | Ritor1 |
---|---|
date | Tue, 01 Oct 2013 09:33:38 +0600 |
parents | 24e756a50073 |
children | 4dee76d79c78 633f81bb3ae7 |
comparison
equal
deleted
inserted
replaced
1761:5be18330f9a3 | 1762:2b8b748a222a |
---|---|
822 auto buff = player->pPlayerBuffs + i; | 822 auto buff = player->pPlayerBuffs + i; |
823 if (buff->uExpireTime > 0) | 823 if (buff->uExpireTime > 0) |
824 { | 824 { |
825 v36 = uFramesetIDa++ * pFontComic->uFontHeight + 134; | 825 v36 = uFramesetIDa++ * pFontComic->uFontHeight + 134; |
826 window->DrawText(pFontComic, 52, v36, ui_game_character_record_playerbuff_colors[i], aSpellNames[20 + i], 0, 0, 0); | 826 window->DrawText(pFontComic, 52, v36, ui_game_character_record_playerbuff_colors[i], aSpellNames[20 + i], 0, 0, 0); |
827 sub_41D20D_buff_remaining_time_string(v36, window, buff->uExpireTime - pParty->uTimePlayed, pFontComic); | 827 DrawBuff_remaining_time_string(v36, window, buff->uExpireTime - pParty->uTimePlayed, pFontComic); |
828 } | 828 } |
829 } | 829 } |
830 | 830 |
831 v39 = ""; | 831 v39 = ""; |
832 if ( uFramesetIDa == 0 ) | 832 if ( uFramesetIDa == 0 ) |