diff Outdoor.cpp @ 1:ac0fb48cd27a

Texture, hwl loading, video player
author Nomad
date Tue, 09 Oct 2012 13:09:08 +0200
parents 8b8875f5b359
children be2066176d89
line wrap: on
line diff
--- a/Outdoor.cpp	Fri Oct 05 16:07:14 2012 +0200
+++ b/Outdoor.cpp	Tue Oct 09 13:09:08 2012 +0200
@@ -1477,7 +1477,7 @@
           v149 = (void *)(v20 != -1 ? &pBitmaps_LOD->pTextures[v20] : 0);
           auto pTex = (Texture *)v149;
           if (pTex)
-            pTex->palette = pPaletteManager->LoadPalette(pTex->palette);
+            pTex->palette_id2 = pPaletteManager->LoadPalette(pTex->palette_id1);
           goto LABEL_20;
         }
         pTextureFrameTable->LoadAnimationSequenceAndPalettes(
@@ -1613,11 +1613,11 @@
     v36 = v5->uSky_TextureID;
     v5->uMainTile_BitmapID = v35;
     if ( v36 != -1 )
-      HIWORD(pBitmaps_LOD->pTextures[v36].palette) = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[v36].palette);
+      pBitmaps_LOD->pTextures[v36].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[v36].palette_id1);
 
     v37 = v5->uMainTile_BitmapID;
     if ( v37 != -1 )
-      HIWORD(pBitmaps_LOD->pTextures[v37].palette) = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[v37].palette);
+      pBitmaps_LOD->pTextures[v37].palette_id2 = pPaletteManager->LoadPalette(pBitmaps_LOD->pTextures[v37].palette_id1);
 
     v5->_47F0E2();
     pGameLoadingUI_ProgressBar->Progress();
@@ -1813,9 +1813,9 @@
 LABEL_68:
         v63->uTextureID = v62;
         v145 = (signed __int16)v62 != -1 ? (int)&pBitmaps_LOD->pTextures[(signed __int16)v62] : 0;
-        v108 = ((signed __int16)v62 != -1 ? LOWORD(pBitmaps_LOD->pTextures[(signed __int16)v62].palette) : 36);
+        v108 = ((signed __int16)v62 != -1 ? pBitmaps_LOD->pTextures[(signed __int16)v62].palette_id1 : 36);
         if ((signed __int16)v62 != -1)
-          HIWORD(pBitmaps_LOD->pTextures[v62].palette) = pPaletteManager->LoadPalette(v108);
+          pBitmaps_LOD->pTextures[v62].palette_id2 = pPaletteManager->LoadPalette(v108);
         goto LABEL_69;
       }
       v108 = *(unsigned __int16 *)((char *)&v5->pBModels[v48].pFaces->uTextureID + (unsigned int)v149);
@@ -2159,9 +2159,9 @@
   v5->uMainTile_BitmapID = v99;
   if ( v99 != -1 )
   {
-    v108 = *(short *)(v99 != -1 ? &pBitmaps_LOD->pTextures[v99].palette : (int *)36);
+    v108 = (v99 != -1 ? pBitmaps_LOD->pTextures[v99].palette_id1 : 36);
     if (v99 != -1)
-      HIWORD(pBitmaps_LOD->pTextures[v99].palette) = pPaletteManager->LoadPalette(v108);
+      pBitmaps_LOD->pTextures[v99].palette_id2 = pPaletteManager->LoadPalette(v108);
   }
   v5->_47F0E2();
 LABEL_150:
@@ -2188,9 +2188,9 @@
   v5->uSky_TextureID = v101;
   if ( v101 != -1 )
   {
-    v108 = *(short *)(v101 != -1 ? &pBitmaps_LOD->pTextures[v101].palette : (int *)36);
+    v108 = (v101 != -1 ? pBitmaps_LOD->pTextures[v101].palette_id1 : 36);
     if (v101 != -1)
-      HIWORD(pBitmaps_LOD->pTextures[v101].palette) = pPaletteManager->LoadPalette(v108);
+      pBitmaps_LOD->pTextures[v101].palette_id2 = pPaletteManager->LoadPalette(v108);
   }
   pPaletteManager->RecalculateAll();
   pSoundList->_4A9A67(53, 0);
@@ -2567,7 +2567,7 @@
     {
       if ( v1 != -1 ? (int)v3 : 0 )
         v3->uDecompressedSize = v2->pTerrain._47CB57((int)v3->pLevelOfDetail0,
-                                                      HIWORD(v3->palette),
+                                                      v3->palette_id2,
                                                       v3->uTextureWidth * v3->uTextureHeight);
       ++v1;
       ++v3;