Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_5.cpp	Sun Jun 09 00:30:48 2013 +0200
+++ b/mm7_5.cpp	Sun Jun 09 01:10:49 2013 +0200
@@ -1964,7 +1964,7 @@
           uNumSeconds = (unsigned int)&pPlayer->pInstalledBeacons[uMessageParam];
           if ( bRecallingBeacon )
           {
-            if ( !*((int *)&pSavegameThumbnails->pPixels + 10 * uMessageParam) )
+            if ( !*((int *)&pSavegameThumbnails.data()->pPixels + 10 * uMessageParam) )
               continue;
             v173 = pMapStats->pInfos[sub_410D99_get_map_index(HIWORD(pPlayer->pInstalledBeacons[uMessageParam].field_18))].pName;
             sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[474], v173);// "Recall to %s"
@@ -1975,7 +1975,7 @@
           thise = "Not in Map Stats";
           if ( v59 )
             thise = pMapStats->pInfos[v59].pName;
-          if ( !*((int *)&pSavegameThumbnails->pPixels + 10 * uMessageParam) || !v59 )
+          if ( !*((int *)&pSavegameThumbnails.data()->pPixels + 10 * uMessageParam) || !v59 )
           {
             sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[476], thise);// "Set to %s"
             GameUI_SetFooterString(pTmpBuf.data());
@@ -5974,7 +5974,7 @@
 {
   for (uint i = 0; i < uNumBillboardsToDraw; ++i)
   {
-    auto p = pBillboardRenderList + i;
+    auto p = &pBillboardRenderList[i];
 
     if (p->field_1E & 2 || uCurrentlyLoadedLevelType == LEVEL_Indoor && !p->uIndoorSectorID)
       p->dimming_level = 0;
@@ -9255,7 +9255,7 @@
   v27 = 0;
   if ( uNumMaxBeacons > 0 )
   {
-    v29 = pSavegameThumbnails;
+    v29 = pSavegameThumbnails.data();
     v28 = pPlayer->pInstalledBeacons;
     while ( 1 )
     {