Mercurial > mm7

comparison UIPartyCreation.cpp @ 1055:010a844ef4a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 22 May 2013 22:23:04 +0600
parents 9ac94d00012e
children 39f42990698f
comparison
equal deleted inserted replaced
1054:5520fdca7a74 1055:010a844ef4a0
1 #include <assert.h> 1 #include <assert.h>
2 2
3 #include "MM7.h" 3 #include "MM7.h"
4
5 #include "LightmapBuilder.h"
6 #include "DecalBuilder.h"
7 #include "ParticleEngine.h"
8 #include "Mouse.h"
9 #include "Keyboard.h"
10 #include "IndoorCameraD3D.h"
11 #include "CShow.h"
12 #include "GammaControl.h"
13 #include "stru6.h"
14 #include "stru9.h"
15 #include "stru10.h"
16 #include "stru11.h"
17 #include "stru12.h"
4 18
5 #include "MapInfo.h" 19 #include "MapInfo.h"
6 #include "Game.h" 20 #include "Game.h"
7 #include "GUIWindow.h" 21 #include "GUIWindow.h"
8 #include "GUIFont.h" 22 #include "GUIFont.h"
91 pIcons_LOD->pFacesLock = pIcons_LOD->uNumLoadedFiles; 105 pIcons_LOD->pFacesLock = pIcons_LOD->uNumLoadedFiles;
92 106
93 for (uint i = 0; i < 4; ++i) 107 for (uint i = 0; i < 4; ++i)
94 for (uint j = 0; j < 56; ++j) 108 for (uint j = 0; j < 56; ++j)
95 { 109 {
96 sprintf(pTmpBuf, "%s%02d", pPlayerPortraitsNames[pParty->pPlayers[i].uFace], j + 1); 110 sprintf(pTmpBuf, "%s%02d", pPlayerPortraitsNames[pParty->pPlayers[i].uCurrentFace], j + 1);
97 pTextures_PlayerFaces[i][j] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE); 111 pTextures_PlayerFaces[i][j] = pIcons_LOD->LoadTexturePtr(pTmpBuf, TEXTURE_16BIT_PALETTE);
98 } 112 }
99 113
100 pTexture_PlayerFaceEradicated = pIcons_LOD->LoadTexturePtr("ERADCATE", TEXTURE_16BIT_PALETTE); 114 pTexture_PlayerFaceEradicated = pIcons_LOD->LoadTexturePtr("ERADCATE", TEXTURE_16BIT_PALETTE);
101 pTexture_PlayerFaceDead = pIcons_LOD->LoadTexturePtr("DEAD", TEXTURE_16BIT_PALETTE); 115 pTexture_PlayerFaceDead = pIcons_LOD->LoadTexturePtr("DEAD", TEXTURE_16BIT_PALETTE);
197 assert(false && "Invalid selected character"); 211 assert(false && "Invalid selected character");
198 } 212 }
199 213
200 pTextCenter = pFontCChar->AlignText_Center(640, pGlobalTXT_LocalizationStrings[51]); 214 pTextCenter = pFontCChar->AlignText_Center(640, pGlobalTXT_LocalizationStrings[51]);
201 pGUIWindow_CurrentMenu->DrawText(pFontCChar, pTextCenter + 1, 0, 0, pGlobalTXT_LocalizationStrings[51], 0, 0, 0); 215 pGUIWindow_CurrentMenu->DrawText(pFontCChar, pTextCenter + 1, 0, 0, pGlobalTXT_LocalizationStrings[51], 0, 0, 0);
202 pRenderer->DrawTextureTransparent(17, 35, pPlayerPortraits[pParty->pPlayers[0].uFace]); 216 pRenderer->DrawTextureTransparent(17, 35, pPlayerPortraits[pParty->pPlayers[0].uCurrentFace]);
203 pRenderer->DrawTextureTransparent(176, 35, pPlayerPortraits[pParty->pPlayers[1].uFace]); 217 pRenderer->DrawTextureTransparent(176, 35, pPlayerPortraits[pParty->pPlayers[1].uCurrentFace]);
204 pRenderer->DrawTextureTransparent(335, 35, pPlayerPortraits[pParty->pPlayers[2].uFace]); 218 pRenderer->DrawTextureTransparent(335, 35, pPlayerPortraits[pParty->pPlayers[2].uCurrentFace]);
205 pRenderer->DrawTextureTransparent(494, 35, pPlayerPortraits[pParty->pPlayers[3].uFace]); 219 pRenderer->DrawTextureTransparent(494, 35, pPlayerPortraits[pParty->pPlayers[3].uCurrentFace]);
206 pFrame = pIconsFrameTable->GetFrame(uIconID_CharacterFrame, pEventTimer->uStartTime); 220 pFrame = pIconsFrameTable->GetFrame(uIconID_CharacterFrame, pEventTimer->uStartTime);
207 221
208 222
209 pRenderer->DrawTextureTransparent(pX, 29, &pIcons_LOD->pTextures[pFrame->uTextureID]); 223 pRenderer->DrawTextureTransparent(pX, 29, &pIcons_LOD->pTextures[pFrame->uTextureID]);
210 uPosActiveItem = pGUIWindow_CurrentMenu->GetControl(pGUIWindow_CurrentMenu->pCurrentPosActiveItem); 224 uPosActiveItem = pGUIWindow_CurrentMenu->GetControl(pGUIWindow_CurrentMenu->pCurrentPosActiveItem);