Mercurial > mm7

comparison mm7_5.cpp @ 1206:ab6560001f5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arrays to std::arrays phase 2 - some more arrays converted
author Grumpy7
date Sun, 09 Jun 2013 01:10:49 +0200
parents 8c02e6f74b29
children 96a81634669e
comparison
equal deleted inserted replaced
1205:8c02e6f74b29 1206:ab6560001f5b
1962 continue; 1962 continue;
1963 pPlayer = pPlayers[_506348_current_lloyd_playerid + 1]; 1963 pPlayer = pPlayers[_506348_current_lloyd_playerid + 1];
1964 uNumSeconds = (unsigned int)&pPlayer->pInstalledBeacons[uMessageParam]; 1964 uNumSeconds = (unsigned int)&pPlayer->pInstalledBeacons[uMessageParam];
1965 if ( bRecallingBeacon ) 1965 if ( bRecallingBeacon )
1966 { 1966 {
1967 if ( !*((int *)&pSavegameThumbnails->pPixels + 10 * uMessageParam) ) 1967 if ( !*((int *)&pSavegameThumbnails.data()->pPixels + 10 * uMessageParam) )
1968 continue; 1968 continue;
1969 v173 = pMapStats->pInfos[sub_410D99_get_map_index(HIWORD(pPlayer->pInstalledBeacons[uMessageParam].field_18))].pName; 1969 v173 = pMapStats->pInfos[sub_410D99_get_map_index(HIWORD(pPlayer->pInstalledBeacons[uMessageParam].field_18))].pName;
1970 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[474], v173);// "Recall to %s" 1970 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[474], v173);// "Recall to %s"
1971 GameUI_SetFooterString(pTmpBuf.data()); 1971 GameUI_SetFooterString(pTmpBuf.data());
1972 continue; 1972 continue;
1973 } 1973 }
1974 v59 = pMapStats->GetMapInfo(pCurrentMapName.data()); 1974 v59 = pMapStats->GetMapInfo(pCurrentMapName.data());
1975 thise = "Not in Map Stats"; 1975 thise = "Not in Map Stats";
1976 if ( v59 ) 1976 if ( v59 )
1977 thise = pMapStats->pInfos[v59].pName; 1977 thise = pMapStats->pInfos[v59].pName;
1978 if ( !*((int *)&pSavegameThumbnails->pPixels + 10 * uMessageParam) || !v59 ) 1978 if ( !*((int *)&pSavegameThumbnails.data()->pPixels + 10 * uMessageParam) || !v59 )
1979 { 1979 {
1980 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[476], thise);// "Set to %s" 1980 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[476], thise);// "Set to %s"
1981 GameUI_SetFooterString(pTmpBuf.data()); 1981 GameUI_SetFooterString(pTmpBuf.data());
1982 continue; 1982 continue;
1983 } 1983 }
5972 //----- (0043F515) -------------------------------------------------------- 5972 //----- (0043F515) --------------------------------------------------------
5973 void FindBillboardsLightLevels_BLV() 5973 void FindBillboardsLightLevels_BLV()
5974 { 5974 {
5975 for (uint i = 0; i < uNumBillboardsToDraw; ++i) 5975 for (uint i = 0; i < uNumBillboardsToDraw; ++i)
5976 { 5976 {
5977 auto p = pBillboardRenderList + i; 5977 auto p = &pBillboardRenderList[i];
5978 5978
5979 if (p->field_1E & 2 || uCurrentlyLoadedLevelType == LEVEL_Indoor && !p->uIndoorSectorID) 5979 if (p->field_1E & 2 || uCurrentlyLoadedLevelType == LEVEL_Indoor && !p->uIndoorSectorID)
5980 p->dimming_level = 0; 5980 p->dimming_level = 0;
5981 else 5981 else
5982 p->dimming_level = _43F55F_get_billboard_light_level(p, -1); 5982 p->dimming_level = _43F55F_get_billboard_light_level(p, -1);
9253 } 9253 }
9254 result = 0; 9254 result = 0;
9255 v27 = 0; 9255 v27 = 0;
9256 if ( uNumMaxBeacons > 0 ) 9256 if ( uNumMaxBeacons > 0 )
9257 { 9257 {
9258 v29 = pSavegameThumbnails; 9258 v29 = pSavegameThumbnails.data();
9259 v28 = pPlayer->pInstalledBeacons; 9259 v28 = pPlayer->pInstalledBeacons;
9260 while ( 1 ) 9260 while ( 1 )
9261 { 9261 {
9262 pWindow.uFrameWidth = 92; 9262 pWindow.uFrameWidth = 92;
9263 v4 = result; 9263 v4 = result;