Mercurial > mm7
diff Game.cpp @ 2275:8193a64c7461
Слияние
author | Ritor1 |
---|---|
date | Fri, 14 Mar 2014 09:32:42 +0600 |
parents | fd788d2e9585 |
children | b9adf4f414f6 |
line wrap: on
line diff
--- a/Game.cpp Fri Mar 14 09:32:25 2014 +0600 +++ b/Game.cpp Fri Mar 14 09:32:42 2014 +0600 @@ -72,14 +72,11 @@ //----- (0044103C) -------------------------------------------------------- void Game::Draw() { - //float v2; // ST24_4@11 - //double v3; // ST28_8@11 int v4; // edi@26 - //int v5; // eax@35 uFlags2 &= ~0x02; if ( pParty->_497FC5_check_party_perception_against_level() ) - uFlags2 |= 2u; + uFlags2 |= 2; pGame->pIndoorCameraD3D->sRotationX = pParty->sRotationX; pGame->pIndoorCameraD3D->sRotationY = pParty->sRotationY; @@ -2987,7 +2984,7 @@ { if ( !*((int *)&pSavegameThumbnails[10 * uMessageParam].pPixels ) ) continue; - v173 = pMapStats->pInfos[sub_410D99_get_map_index(pPlayer->pInstalledBeacons[uMessageParam].SaveFileID)].pName; + v173 = pMapStats->pInfos[pMapStats->sub_410D99_get_map_index(pPlayer->pInstalledBeacons[uMessageParam].SaveFileID)].pName; sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[474], v173);// "Recall to %s" GameUI_SetFooterString(pTmpBuf.data()); continue; @@ -3002,7 +2999,7 @@ GameUI_SetFooterString(pTmpBuf.data()); continue; } - v174 = pMapStats->pInfos[sub_410D99_get_map_index(*(short *)(uNumSeconds + 26))].pName; + v174 = pMapStats->pInfos[pMapStats->sub_410D99_get_map_index(*(short *)(uNumSeconds + 26))].pName; sprintf(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[475], (unsigned int)pMapName, v174);// "Set %s over %s" GameUI_SetFooterString(pTmpBuf.data()); continue;