mm7: UI/UiGame.cpp comparison

comparison UI/UiGame.cpp @ 1980:c1c74df0a33e

changing most of auto types to their actual types

author	Grumpy7
date	Wed, 30 Oct 2013 00:47:37 -0700
parents	211dfe2d8db1
children	5cd26f2c6904

comparison

equal deleted inserted replaced

-:92dfa0cafbe3
+:c1c74df0a33e
 int uTextureID_GameUI_CharSelectionFrame; // 50C98C
 //----- (00421D00) --------------------------------------------------------
 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID)
 {
-auto player = &pParty->pPlayers[uPlayerID - 1];
+Player* player = &pParty->pPlayers[uPlayerID - 1];
 if (pParty->pPickedItem.uItemID)
 {
-if (auto slot = player->AddItem(-1, pParty->pPickedItem.uItemID))
+if (int slot = player->AddItem(-1, pParty->pPickedItem.uItemID))
 {
 memcpy(&player->pInventoryItemList[slot-1], &pParty->pPickedItem, 0x24u);
 viewparams->bRedrawGameUI = true;
 pMouse->RemoveHoldingItem();
 return;
 pInString = pNPCStats->pNPCGreetings[pNPC->greet].pGreeting1;
 }
 }
 else if (pGreetType == 2)//HiredNPC_greet
 {
-auto prof = pNPCStats->pProfessions + pNPC->uProfession;
+NPCProfession* prof = &pNPCStats->pProfessions[pNPC->uProfession];
 if (pNPC->Hired())
 pInString = BuildDialogueString(prof->pDismissText, uActiveCharacter - 1, 0, 0, 0, 0);
 else
 pInString = BuildDialogueString(prof->pJoinText, uActiveCharacter - 1, 0, 0, 0, 0);
 // Message window(Окно сообщения)----
 if (pInString)
 {
 window.uFrameWidth = game_viewport_width;
 window.uFrameZ = 452;
-auto font = pFontArrus;
+GUIFont* font = pFontArrus;
 pTextHeight = pFontArrus->CalcTextHeight(pInString, &window, 13, 0) + 7;
 if ( 352 - pTextHeight < 8 )
 {
 font = pFontCreate;
 pTextHeight = pFontCreate->CalcTextHeight(pInString, &window, 13, 0) + 7;
 window->DrawText(pFontArrus, 120, 22, 0, pTmpBuf.data(), 0, 0, 0);
 uFramesetIDa = 0;
 for (uint i = 0; i < 24; ++i)
 {
-auto buff = player->pPlayerBuffs.data() + i;
+SpellBuff* buff = &player->pPlayerBuffs[i];
 if (buff->uExpireTime > 0)
 {
 v36 = uFramesetIDa++ * pFontComic->uFontHeight + 134;
 window->DrawText(pFontComic, 52, v36, ui_game_character_record_playerbuff_colors[i], aSpellNames[20 + i], 0, 0, 0);
 DrawBuff_remaining_time_string(v36, window, buff->uExpireTime - pParty->uTimePlayed, pFontComic);
 pRenderer->DrawTextureIndexed(8, 8, pIcons_LOD->LoadTexturePtr("quikref", TEXTURE_16BIT_PALETTE));
 pFontHeight = LOBYTE(pFontArrus->uFontHeight) + 1;
 for ( uint i = 0; i < 4; ++i )
 {
-auto player = &pParty->pPlayers[i];
+Player* player = &pParty->pPlayers[i];
 pX = 94 * i + 89;
 if ( i == 0 )
 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 22, 18, 0, pGlobalTXT_LocalizationStrings[149], 60, 0);//Name
 pGUIWindow_CurrentMenu->DrawTextInRect(pFontArrus, 94 * i + 89, 18, ui_character_header_text_color, player->pName, 84, 0);
 if ( i == 0 )
 for (uint i = 0; i < 14; ++i)
 {
 //v2 =  byte_4E5DD8[v1];
 if (pParty->pPartyBuffs[byte_4E5DD8[i]].uExpireTime)
 {
-auto tex = pIcons_LOD->GetTexture(pTextureIDs_PartyBuffIcons[i]);
+Texture* tex = pIcons_LOD->GetTexture(pTextureIDs_PartyBuffIcons[i]);
 //v3 = pTextureIDs_PartyBuffIcons[i];
 pRenderer->_4A65CC(pPartySpellbuffsUI_XYs[i][0],
 pPartySpellbuffsUI_XYs[i][1], tex, tex,
 v0 + 20 * pPartySpellbuffsUI_smthns[i], 0, 63);
 }
 unsigned int pColor;
 uCenterX = (uX + uZ) / 2;
 uCenterY = (uY + uW) / 2;
 lPitch = pRenderer->uTargetSurfacePitch;
-auto bWizardEyeActive = pParty->WizardEyeActive();
+bool bWizardEyeActive = pParty->WizardEyeActive();
-auto uWizardEyeSkillLevel = pParty->WizardEyeSkillLevel();
+int uWizardEyeSkillLevel = pParty->WizardEyeSkillLevel();
 if ( CheckHiredNPCSpeciality(Cartographer) )
 {
 bWizardEyeActive = true;
 uWizardEyeSkillLevel = 2;
 }
 uHeight = uW - uY;
 uWidth = uZ - uX;
 if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor)
 {
-auto pMapLod0 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pLevelOfDetail0_prolly_alpha_mask;
+uchar* pMapLod0 = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pLevelOfDetail0_prolly_alpha_mask;
-auto pPal = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pPalette16;
+ushort* pPal = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].pPalette16;
 v73 = (1 << (pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2 + 16)) / (signed int)uZoom;
 v20 = (double)(pParty->vPosition.x + 32768) / (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2));
 uWb = (double)(32768 - pParty->vPosition.y) / (double)(1 << (16 - pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uWidthLn2));
 switch (uZoom)
 {
 if (pMapLod0 && bRedrawOdmMinimap)
 {
 assert(uWidth == 137 && uHeight == 117);
 //auto pMinimap = (unsigned __int16 *)pOdmMinimap;
-auto mapWidth = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uTextureWidth;
+ushort mapWidth = pIcons_LOD->pTextures[viewparams->uTextureID_LocationMap].uTextureWidth;
 v29 = v70 >> 16;
 for (int y = 0; y < uHeight; ++y)
 {
-auto pMapLod0Line = &pMapLod0[v27 * mapWidth];
+uchar* pMapLod0Line = &pMapLod0[v27 * mapWidth];
 for (int x = 0; x < uWidth; ++x)
 {
 //*pMinimap++ = pPal[pMapLod0Line[v29]];
 pOdmMinimap[y][x] = pPal[pMapLod0Line[v29]];
 v29 = (v70 + x * v73) >> 16;
 pRenderer->FillRectFast(uX, uY, uZ - uX, uHeight, 0xF);
 uNumBlueFacesInBLVMinimap = 0;
 for (uint i = 0; i < (uint)pIndoor->pMapOutlines->uNumOutlines; ++i)
 {
-auto pOutline = &pIndoor->pMapOutlines->pOutlines[i];
+BLVMapOutline* pOutline = &pIndoor->pMapOutlines->pOutlines[i];
-auto pFace1 = pIndoor->pFaces + pOutline->uFace1ID;
+BLVFace* pFace1 = pIndoor->pFaces + pOutline->uFace1ID;
-auto pFace2 = pIndoor->pFaces + pOutline->uFace2ID;
+BLVFace* pFace2 = pIndoor->pFaces + pOutline->uFace2ID;
 //v9 = pIndoor->pFaces[pMapVertex->uFace1ID].uAttributes;
 //v10 = pIndoor->pFaces[pMapVertex->uFace2ID].uAttributes;
 if (pFace1->Visible() && pFace2->Visible())
 {
 if ( pOutline->uFlags & 1 )
 if (uNumBlueFacesInBLVMinimap < 49)
 pBlueFacesInBLVMinimapIDs[uNumBlueFacesInBLVMinimap++] = i;
 }
 else
 {
-auto _a = (uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].x);
+long long _a = (uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].x);
-auto _b = ((unsigned int)((unsigned __int64)_a >> 16) << 16);
+uint _b = ((unsigned int)((unsigned __int64)_a >> 16) << 16);
-auto _c = ((signed int)(_b - uZoom * pParty->vPosition.x) >> 16);
+int _c = ((signed int)(_b - uZoom * pParty->vPosition.x) >> 16);
 pX = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16);
 pY = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16);
 pZ = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16);
 pW = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16);
 v15 = abs(pOutline->sZ - pParty->vPosition.z) / 8;
 }
 }
 for (uint i = 0; i < uNumBlueFacesInBLVMinimap; ++i)
 {
-auto pOutline = &pIndoor->pMapOutlines->pOutlines[pBlueFacesInBLVMinimapIDs[i]];
+BLVMapOutline* pOutline = &pIndoor->pMapOutlines->pOutlines[pBlueFacesInBLVMinimapIDs[i]];
 pX = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)((signed int)uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16);
 pY = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)((signed int)uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex1ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16);
 pZ = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)((signed int)uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16);
 pW = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)((signed int)uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16);
 pRenderer->RasterLine2D(pX, pY, pZ, pW, ui_game_minimap_outline_color);
 || pCurrentScreen == SCREEN_BOOKS
 || pCurrentScreen == SCREEN_BRANCHLESS_NPC_DIALOG )
 {
 if (pParty->TorchlightActive())
 {
-auto icon = pIconsFrameTable->GetFrame((signed __int16)pUIAnum_Torchlight->uIconID, pEventTimer->Time());
+IconFrame* icon = pIconsFrameTable->GetFrame((signed __int16)pUIAnum_Torchlight->uIconID, pEventTimer->Time());
 pRenderer->DrawTextureTransparent(pUIAnum_Torchlight->x, pUIAnum_Torchlight->y, pIcons_LOD->GetTexture(icon->uTextureID));
 }
 if (pParty->WizardEyeActive())
 {
-auto icon = pIconsFrameTable->GetFrame((signed __int16)pUIAnim_WizardEye->uIconID, pEventTimer->Time());
+IconFrame* icon = pIconsFrameTable->GetFrame((signed __int16)pUIAnim_WizardEye->uIconID, pEventTimer->Time());
 pRenderer->DrawTextureTransparent(pUIAnim_WizardEye->x, pUIAnim_WizardEye->y, pIcons_LOD->GetTexture(icon->uTextureID));
 }
 }
 }
 // 4E28F8: using guessed type int pCurrentScreen;

Mercurial > mm7

comparison UI/UiGame.cpp @ 1980:c1c74df0a33e