Mercurial > mm7

comparison UiGame.cpp @ 948:5a2dbb00c399

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Code cleaning.
author Nomad
date Wed, 01 May 2013 17:31:10 +0200
parents 9be9afdbeac3
children c0d0656aa662
comparison
equal deleted inserted replaced
947:99aa9c8464cf 948:5a2dbb00c399
129 v7 = uTextureID_mhp_yel; 129 v7 = uTextureID_mhp_yel;
130 v9 = v7; 130 v9 = v7;
131 } 131 }
132 } 132 }
133 v8 = a2->uFrameX + (signed int)(a2->uFrameWidth - v4) / 2; 133 v8 = a2->uFrameX + (signed int)(a2->uFrameWidth - v4) / 2;
134
134 pRenderer->SetTextureClipRect(v8, a2->uFrameY + 32, v8 + v4, a2->uFrameY + 52); 135 pRenderer->SetTextureClipRect(v8, a2->uFrameY + 32, v8 + v4, a2->uFrameY + 52);
135 pRenderer->DrawTextureIndexed( 136 pRenderer->DrawTextureIndexed(v8, v3->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_bd));
136 v8,
137 v3->uFrameY + 32,
138 (Texture *)(uTextureID_mhp_bd != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_mhp_bd] : 0));
139 pRenderer->SetTextureClipRect(v8, v3->uFrameY + 32, v8 + v10, v3->uFrameY + 52); 137 pRenderer->SetTextureClipRect(v8, v3->uFrameY + 32, v8 + v10, v3->uFrameY + 52);
140 pRenderer->DrawTextureIndexed( 138 pRenderer->DrawTextureIndexed(v8, v3->uFrameY + 34, pIcons_LOD->GetTexture(v9));
141 v8, 139
142 v3->uFrameY + 34,
143 (Texture *)(v9 != -1 ? (int)&pIcons_LOD->pTextures[v9] : 0));
144 pRenderer->ResetTextureClipRect(); 140 pRenderer->ResetTextureClipRect();
145 141 pRenderer->DrawTextureIndexed(v8 - 5, v3->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_capl));
146 pRenderer->DrawTextureIndexed( 142 pRenderer->DrawTextureIndexed(v8 + v4, v3->uFrameY + 32, pIcons_LOD->GetTexture(uTextureID_mhp_capr));
147 v8 - 5,
148 v3->uFrameY + 32,
149 (Texture *)(uTextureID_mhp_capl != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_mhp_capl] : 0));
150 pRenderer->DrawTextureIndexed(
151 v8 + v4,
152 v3->uFrameY + 32,
153 (Texture *)(uTextureID_mhp_capr != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_mhp_capr] : 0));
154 } 143 }
155 144
156 //----- (0041B0C9) -------------------------------------------------------- 145 //----- (0041B0C9) --------------------------------------------------------
157 void __cdecl GameUI_DrawLifeManaBars() 146 void __cdecl GameUI_DrawLifeManaBars()
158 { 147 {
173 Texture *v14; // [sp+18h] [bp-14h]@1 162 Texture *v14; // [sp+18h] [bp-14h]@1
174 float v15; // [sp+1Ch] [bp-10h]@1 163 float v15; // [sp+1Ch] [bp-10h]@1
175 signed int v16; // [sp+24h] [bp-8h]@1 164 signed int v16; // [sp+24h] [bp-8h]@1
176 signed int v17; // [sp+28h] [bp-4h]@8 165 signed int v17; // [sp+28h] [bp-4h]@8
177 166
178 v0 = (Texture *)(uTextureID_BarGreen != -1 ? &pIcons_LOD->pTextures[uTextureID_BarGreen] : 0); 167 v0 = pIcons_LOD->GetTexture(uTextureID_BarGreen);
179 v14 = (Texture *)(uTextureID_BarYellow != -1 ? &pIcons_LOD->pTextures[uTextureID_BarYellow] : 0); 168 v14 = pIcons_LOD->GetTexture(uTextureID_BarYellow);
180 v13 = (Texture *)(uTextureID_BarRed != -1 ? &pIcons_LOD->pTextures[uTextureID_BarRed] : 0); 169 v13 = pIcons_LOD->GetTexture(uTextureID_BarRed);
181 v16 = 0; 170 v16 = 0;
182 v10 = (Texture *)(uTextureID_BarBlue != -1 ? &pIcons_LOD->pTextures[uTextureID_BarBlue] : 0); 171 v10 = pIcons_LOD->GetTexture(uTextureID_BarBlue);
183 v15 = (double)(uTextureID_BarGreen != -1 ? pIcons_LOD->pTextures[uTextureID_BarGreen].uTextureHeight : 26); 172 v15 = v0->uTextureHeight;
184 do 173 do
185 { 174 {
186 v1 = &pParty->pPlayers[v16]; 175 v1 = &pParty->pPlayers[v16];
187 v11 = v1; 176 v11 = v1;
188 if ( v1->sHealth > 0 ) 177 if ( v1->sHealth > 0 )
261 } 250 }
262 251
263 //----- (0041B3B6) -------------------------------------------------------- 252 //----- (0041B3B6) --------------------------------------------------------
264 void __cdecl draw_right_panel() 253 void __cdecl draw_right_panel()
265 { 254 {
266 pRenderer->DrawTextureTransparent(pViewport->uViewportBR_X, 0, 255 pRenderer->DrawTextureTransparent(pViewport->uViewportBR_X, 0, pIcons_LOD->GetTexture(uTextureID_right_panel));
267 (Texture *)(uTextureID_right_panel != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_right_panel] : 0));
268 } 256 }
269 257
270 //----- (0041B3E2) -------------------------------------------------------- 258 //----- (0041B3E2) --------------------------------------------------------
271 void __cdecl GameUI_DrawRightPanelFrames() 259 void __cdecl GameUI_DrawRightPanelFrames()
272 { 260 {
1236 pEventTimer->Pause(); 1224 pEventTimer->Pause();
1237 pAudioPlayer->StopChannels(-1, -1); 1225 pAudioPlayer->StopChannels(-1, -1);
1238 bRingsShownInCharScreen = 0; 1226 bRingsShownInCharScreen = 0;
1239 CharacterUI_LoadPaperdollTextures(); 1227 CharacterUI_LoadPaperdollTextures();
1240 pCurrentScreen = v1; 1228 pCurrentScreen = v1;
1229
1241 pWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0); 1230 pWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0);
1242 pCharacterScreen_StatsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 12, pViewport->uViewportTL_Y + 308, 1231 pCharacterScreen_StatsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 12, pViewport->uViewportTL_Y + 308,
1243 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureWidth : 24), 1232 pIcons_LOD->GetTexture(papredoll_dbrds[9])->uTextureWidth,
1244 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureHeight : 26), 1233 pIcons_LOD->GetTexture(papredoll_dbrds[9])->uTextureHeight,
1245 1, 0, UIMSG_73, 0, 0x53u, pGlobalTXT_LocalizationStrings[216],// Stats 1234 1, 0, UIMSG_73, 0, 'S', pGlobalTXT_LocalizationStrings[216],// Stats
1246 (Texture *)(papredoll_dbrds[10] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[10]] : 0), 1235 pIcons_LOD->GetTexture(papredoll_dbrds[10]),
1247 papredoll_dbrds[9] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[9]] : 0, 0); 1236 pIcons_LOD->GetTexture(papredoll_dbrds[9]), 0);
1248 pCharacterScreen_SkillsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 102, pViewport->uViewportTL_Y + 308, 1237 pCharacterScreen_SkillsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 102, pViewport->uViewportTL_Y + 308,
1249 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureWidth : 24), 1238 pIcons_LOD->GetTexture(papredoll_dbrds[7])->uTextureWidth,
1250 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureHeight : 26), 1239 pIcons_LOD->GetTexture(papredoll_dbrds[7])->uTextureHeight,
1251 1, 0, UIMSG_72, 0, 0x4Bu, pGlobalTXT_LocalizationStrings[205],//Skills 1240 1, 0, UIMSG_72, 0, 'K', pGlobalTXT_LocalizationStrings[205],//Skills
1252 (Texture *)(papredoll_dbrds[8] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[8]] : 0), 1241 pIcons_LOD->GetTexture(papredoll_dbrds[8]),
1253 papredoll_dbrds[7] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[7]] : 0, 0); 1242 pIcons_LOD->GetTexture(papredoll_dbrds[7]), 0);
1254 pCharacterScreen_InventoryBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 192, pViewport->uViewportTL_Y + 308, 1243 pCharacterScreen_InventoryBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 192, pViewport->uViewportTL_Y + 308,
1255 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureWidth : 24), 1244 pIcons_LOD->GetTexture(papredoll_dbrds[5])->uTextureWidth,
1256 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureHeight : 26), 1245 pIcons_LOD->GetTexture(papredoll_dbrds[5])->uTextureHeight,
1257 1, 0, UIMSG_74, 0, 0x49u, pGlobalTXT_LocalizationStrings[120], //Inventory 1246 1, 0, UIMSG_74, 0, 'I', pGlobalTXT_LocalizationStrings[120], //Inventory
1258 (Texture *)(papredoll_dbrds[6] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[6]] : 0), 1247 pIcons_LOD->GetTexture(papredoll_dbrds[6]),
1259 papredoll_dbrds[5] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[5]] : 0, 0); 1248 pIcons_LOD->GetTexture(papredoll_dbrds[5]), 0);
1260 pCharacterScreen_AwardsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 282, pViewport->uViewportTL_Y + 308, 1249 pCharacterScreen_AwardsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 282, pViewport->uViewportTL_Y + 308,
1261 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureWidth : 24), 1250 pIcons_LOD->GetTexture(papredoll_dbrds[3])->uTextureWidth,
1262 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureHeight : 26), 1251 pIcons_LOD->GetTexture(papredoll_dbrds[3])->uTextureHeight,
1263 1, 0, UIMSG_75, 0, 0x41u, pGlobalTXT_LocalizationStrings[22], //Awards 1252 1, 0, UIMSG_75, 0, 'A', pGlobalTXT_LocalizationStrings[22], //Awards
1264 (Texture *)(papredoll_dbrds[4] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[4]] : 0), 1253 pIcons_LOD->GetTexture(papredoll_dbrds[4]),
1265 papredoll_dbrds[3] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[3]] : 0, 0); 1254 pIcons_LOD->GetTexture(papredoll_dbrds[3]), 0);
1266 pCharacterScreen_ExitBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 371, pViewport->uViewportTL_Y + 308, 1255 pCharacterScreen_ExitBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 371, pViewport->uViewportTL_Y + 308,
1267 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureWidth : 24), 1256 pIcons_LOD->GetTexture(papredoll_dbrds[1])->uTextureWidth,
1268 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureHeight : 26), 1257 pIcons_LOD->GetTexture(papredoll_dbrds[1])->uTextureHeight,
1269 1, 0, UIMSG_A8, 0, 0, pGlobalTXT_LocalizationStrings[79],//Exit 1258 1, 0, UIMSG_A8, 0, 0, pGlobalTXT_LocalizationStrings[79],//Exit
1270 (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0), 1259 pIcons_LOD->GetTexture(papredoll_dbrds[2]),
1271 papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 0); 1260 pIcons_LOD->GetTexture(papredoll_dbrds[1]), 0);
1272 pWindow->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, UIMSG_InventoryLeftClick, 0, 0, "", 0); 1261 pWindow->CreateButton(0, 0, 0x1DCu, 0x159u, 1, 122, UIMSG_InventoryLeftClick, 0, 0, "", 0);
1273 pCharacterScreen_DetalizBtn = pWindow->CreateButton(0x258u, 0x12Cu, 0x1Eu, 0x1Eu, 1, 0, UIMSG_ChangeDetaliz, 0, 0, pGlobalTXT_LocalizationStrings[64], 0); 1262 pCharacterScreen_DetalizBtn = pWindow->CreateButton(0x258u, 0x12Cu, 0x1Eu, 0x1Eu, 1, 0, UIMSG_ChangeDetaliz, 0, 0, pGlobalTXT_LocalizationStrings[64], 0);
1274 pCharacterScreen_DollBtn = pWindow->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, UIMSG_ClickPaperdoll, 0, 0, "", 0); 1263 pCharacterScreen_DollBtn = pWindow->CreateButton(0x1DCu, 0, 0xA4u, 0x159u, 1, 0, UIMSG_ClickPaperdoll, 0, 0, "", 0);
1275 pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 1u, 0x31u, "", 0); 1264 pWindow->CreateButton(0x3Du, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 1, '1', "", 0);
1276 pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 2u, 0x32u, "", 0); 1265 pWindow->CreateButton(0xB1u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 2, '2', "", 0);
1277 pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 3u, 0x33u, "", 0); 1266 pWindow->CreateButton(0x124u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 3, '3', "", 0);
1278 pWindow->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 4u, 0x34u, "", 0); 1267 pWindow->CreateButton(0x197u, 0x1A8u, 0x1Fu, 0, 2, 94, UIMSG_SelectCharacter, 4, '4', "", 0);
1279 pWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_CycleCharacters, 0, 9u, "", 0); 1268 pWindow->CreateButton(0, 0, 0, 0, 1, 0, UIMSG_CycleCharacters, 0, '\t', "", 0);
1280 FillAwardsData(); 1269 FillAwardsData();
1281 return pWindow; 1270 return pWindow;
1282 } 1271 }
1283 1272
1284 1273
1413 else 1402 else
1414 { 1403 {
1415 if ( pParty->uFlags & 0x20 ) 1404 if ( pParty->uFlags & 0x20 )
1416 v16 = dword_5079C8; 1405 v16 = dword_5079C8;
1417 } 1406 }
1418 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[PID_ID(pElem->uPackedID)] - 4, 1407 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[PID_ID(pElem->uPackedID)] - 4, 0x181u, pIcons_LOD->GetTexture(v16));
1419 0x181u, (Texture *)(v16 != -1 ? &pIcons_LOD->pTextures[v16] : 0));
1420 } 1408 }
1421 } 1409 }
1422 } 1410 }
1423 } 1411 }
1424 } 1412 }
1437 else 1425 else
1438 { 1426 {
1439 if ( pParty->uFlags & 0x20 ) 1427 if ( pParty->uFlags & 0x20 )
1440 v19 = dword_5079C8; 1428 v19 = dword_5079C8;
1441 } 1429 }
1442 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] - 4, 1430 pRenderer->DrawTextureTransparent(pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i] - 4, 0x181u, pIcons_LOD->GetTexture(v19));
1443 0x181u, (Texture *)(v19 != -1 ? &pIcons_LOD->pTextures[v19] : 0));
1444 } 1431 }
1445 } 1432 }
1446 } 1433 }
1447 } 1434 }
1448 1435
1863 v45 += 32; 1850 v45 += 32;
1864 lPitchb = v45; 1851 lPitchb = v45;
1865 } 1852 }
1866 while ( uZg < (signed int)uNumLevelDecorations ); 1853 while ( uZg < (signed int)uNumLevelDecorations );
1867 } 1854 }
1868 pRenderer->DrawTextureTransparent(0x1D4u, 0, (Texture *)(dword_5079D8 != -1 ? &pIcons_LOD->pTextures[dword_5079D8] : 0)); 1855 pRenderer->DrawTextureTransparent(0x1D4u, 0, pIcons_LOD->GetTexture(dword_5079D8));
1869 uZooma = (double)pParty->sRotationY * 0.1171875; 1856 uZooma = (double)pParty->sRotationY * 0.1171875;
1870 //v50 = uZooma + 6.7553994e15; 1857 //v50 = uZooma + 6.7553994e15;
1871 pRenderer->SetTextureClipRect(541, 0, 567, 480); 1858 pRenderer->SetTextureClipRect(541, 0, 567, 480);
1872 pRenderer->DrawTextureIndexed(floorf(uZooma + 0.5f) + 285, 136, (Texture *)(dword_5079B4 != -1 ? &pIcons_LOD->pTextures[dword_5079B4] : 0)); 1859 pRenderer->DrawTextureIndexed(floorf(uZooma + 0.5f) + 285, 136, pIcons_LOD->GetTexture(dword_5079B4));
1873 pRenderer->ResetTextureClipRect(); 1860 pRenderer->ResetTextureClipRect();
1874 } 1861 }
1875 1862
1876 //----- (00441498) -------------------------------------------------------- 1863 //----- (00441498) --------------------------------------------------------
1877 void __cdecl GameUI_DrawTorchlightAndWizardEye() 1864 void __cdecl GameUI_DrawTorchlightAndWizardEye()
1957 v7 = pTmpBuf[i]; 1944 v7 = pTmpBuf[i];
1958 if ( (unsigned __int8)v7 >= 2 ) 1945 if ( (unsigned __int8)v7 >= 2 )
1959 { 1946 {
1960 sprintf(pContainer, "NPC%03d", pNPCStats->pNPCData[(unsigned __int8)v7 + 499].uPortraitID); 1947 sprintf(pContainer, "NPC%03d", pNPCStats->pNPCData[(unsigned __int8)v7 + 499].uPortraitID);
1961 v15 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 1948 v15 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
1962 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v23], pHiredNPCsIconsOffsetsY[v23], (Texture *)(v15 != -1 ? &pIcons_LOD->pTextures[v15] : 0)); 1949 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v23], pHiredNPCsIconsOffsetsY[v23], pIcons_LOD->GetTexture(v15));
1963 } 1950 }
1964 else 1951 else
1965 { 1952 {
1966 sprintf(pContainer, "NPC%03d", pParty->pHirelings[(unsigned __int8)v7].uPortraitID); 1953 sprintf(pContainer, "NPC%03d", pParty->pHirelings[(unsigned __int8)v7].uPortraitID);
1967 v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE); 1954 v8 = pIcons_LOD->LoadTexture(pContainer, TEXTURE_16BIT_PALETTE);
1968 v9 = v23; 1955 v9 = v23;
1969 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v9], pHiredNPCsIconsOffsetsY[v9], (Texture *)(v8 != -1 ? &pIcons_LOD->pTextures[v8] : 0)); 1956 pRenderer->DrawTextureIndexed(pHiredNPCsIconsOffsetsX[v9], pHiredNPCsIconsOffsetsY[v9], pIcons_LOD->GetTexture(v8));
1970 v10 = (unsigned __int8)pTmpBuf[i]; 1957 v10 = (unsigned __int8)pTmpBuf[i];
1971 if ( pParty->pHirelings[v10].evt_A == 1 ) 1958 if ( pParty->pHirelings[v10].evt_A == 1 )
1972 { 1959 {
1973 uFrameID = pParty->pHirelings[v10].evt_B; 1960 uFrameID = pParty->pHirelings[v10].evt_B;
1974 v11 = pHiredNPCsIconsOffsetsX[v9]; 1961 v11 = pHiredNPCsIconsOffsetsX[v9];