Mercurial > mm7

comparison UI/UiGame.cpp @ 1836:f017f8e79aa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Fri, 11 Oct 2013 18:55:43 +0600
parents 35c1e4ff6ba7
children 211dfe2d8db1
comparison
equal deleted inserted replaced
1835:a5637690ffbb 1836:f017f8e79aa1
30 #include "..\TurnEngine.h" 30 #include "..\TurnEngine.h"
31 #include "..\texts.h" 31 #include "..\texts.h"
32 #include "UIHouses.h" 32 #include "UIHouses.h"
33 #include "..\BSPModel.h" 33 #include "..\BSPModel.h"
34 #include "..\Math.h" 34 #include "..\Math.h"
35 #include "..\Level/Decoration.h"
35 36
36 37
37 int uTextureID_GameUI_CharSelectionFrame; // 50C98C 38 int uTextureID_GameUI_CharSelectionFrame; // 50C98C
38 39
39 //----- (00421D00) -------------------------------------------------------- 40 //----- (00421D00) --------------------------------------------------------
817 window->DrawText(pFontArrus, 120, 22, 0, pTmpBuf.data(), 0, 0, 0); 818 window->DrawText(pFontArrus, 120, 22, 0, pTmpBuf.data(), 0, 0, 0);
818 819
819 uFramesetIDa = 0; 820 uFramesetIDa = 0;
820 for (uint i = 0; i < 24; ++i) 821 for (uint i = 0; i < 24; ++i)
821 { 822 {
822 auto buff = player->pPlayerBuffs + i; 823 auto buff = player->pPlayerBuffs.data() + i;
823 if (buff->uExpireTime > 0) 824 if (buff->uExpireTime > 0)
824 { 825 {
825 v36 = uFramesetIDa++ * pFontComic->uFontHeight + 134; 826 v36 = uFramesetIDa++ * pFontComic->uFontHeight + 134;
826 window->DrawText(pFontComic, 52, v36, ui_game_character_record_playerbuff_colors[i], aSpellNames[20 + i], 0, 0, 0); 827 window->DrawText(pFontComic, 52, v36, ui_game_character_record_playerbuff_colors[i], aSpellNames[20 + i], 0, 0, 0);
827 DrawBuff_remaining_time_string(v36, window, buff->uExpireTime - pParty->uTimePlayed, pFontComic); 828 DrawBuff_remaining_time_string(v36, window, buff->uExpireTime - pParty->uTimePlayed, pFontComic);
930 else 931 else
931 pText = pGlobalTXT_LocalizationStrings[153];//Нет 932 pText = pGlobalTXT_LocalizationStrings[153];//Нет
932 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, pX, pY, 0, pText, 84, 0); 933 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, pX, pY, 0, pText, 84, 0);
933 } 934 }
934 935
935 if ( GetPartyReputation() >= 0 ) 936 if ( pParty->GetPartyReputation() >= 0 )
936 { 937 {
937 if ( GetPartyReputation() <= 5 ) 938 if ( pParty->GetPartyReputation() <= 5 )
938 pTextColor = ui_character_default_text_color; 939 pTextColor = ui_character_default_text_color;
939 else 940 else
940 pTextColor = ui_character_bonus_text_color_neg; 941 pTextColor = ui_character_bonus_text_color_neg;
941 } 942 }
942 else 943 else
943 pTextColor = ui_character_bonus_text_color; 944 pTextColor = ui_character_bonus_text_color;
944 945
945 sprintf(pTmpBuf.data(), "%s: \f%05d%s\f00000", pGlobalTXT_LocalizationStrings[180], pTextColor, GetReputationString(GetPartyReputation()));//Reputation 946 sprintf(pTmpBuf.data(), "%s: \f%05d%s\f00000", pGlobalTXT_LocalizationStrings[180], pTextColor, GetReputationString(pParty->GetPartyReputation()));//Reputation
946 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf.data(), 0, 0, 0); 947 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf.data(), 0, 0, 0);
947 sprintf(pTmpBuf.data(), "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], pParty->GetPartyFame());// Fame Слава 948 sprintf(pTmpBuf.data(), "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], pParty->GetPartyFame());// Fame Слава
948 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf.data(), 0, 0, 0); 949 pGUIWindow_CurrentMenu->DrawText(pFontArrus, 0, 323, 0, pTmpBuf.data(), 0, 0, 0);
949 } 950 }
950 951
1718 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1719 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1719 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1720 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1720 else 1721 else
1721 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1722 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1722 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1723 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1723 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1724 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1724 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1725 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1725 sub_441A4E(i); 1726 sub_441A4E(i);
1726 continue; 1727 continue;
1727 } 1728 }
1728 if (pPlayer->IsDead()) 1729 if (pPlayer->IsDead())
1731 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1732 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1732 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1733 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1733 else 1734 else
1734 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1735 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1735 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1736 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1736 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1737 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1737 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1738 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1738 sub_441A4E(i); 1739 sub_441A4E(i);
1739 continue; 1740 continue;
1740 } 1741 }
1741 face_expression_ID = 0; 1742 face_expression_ID = 0;
1758 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime ) 1759 if ( pParty->pPartyBuffs[PARTY_BUFF_INVISIBILITY].uExpireTime )
1759 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait); 1760 pRenderer->_4A6E7E(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i], 388, pPortrait);
1760 else 1761 else
1761 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait); 1762 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] + 1, 388, pPortrait);
1762 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime 1763 if ( pPlayer->pPlayerBuffs[PLAYER_BUFF_BLESS].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_HASTE].uExpireTime
1763 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_13].uExpireTime 1764 | pPlayer->pPlayerBuffs[PLAYER_BUFF_HEROISM].uExpireTime | pPlayer->pPlayerBuffs[PLAYER_BUFF_SHIELD].uExpireTime
1764 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime ) 1765 | pPlayer->pPlayerBuffs[PLAYER_BUFF_STONESKIN].uExpireTime )
1765 sub_441A4E(i); 1766 sub_441A4E(i);
1766 continue; 1767 continue;
1767 } 1768 }
1768 } 1769 }