Mercurial > mm7

changeset 52:ac65389dc211

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
21.01.13
author Ritor1
date Mon, 21 Jan 2013 01:06:55 +0600
parents 979f13f456dc
children 1bcaa67d05e0
files Render.cpp mm7_4.cpp
diffstat 2 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Render.cpp	Sun Jan 20 21:35:06 2013 +0600
+++ b/Render.cpp	Mon Jan 21 01:06:55 2013 +0600
@@ -2857,23 +2857,23 @@
     v1 = (char *)&pBillboardRenderList[0].uScreenSpaceY;
     do
     {
-      billboard.uScreenSpaceX = *((short *)v1 - 1);
-      v2 = *((short *)v1 - 5);
-      billboard.uScreenSpaceY = *(short *)v1;
-      v3 = *((int *)v1 - 10);
+      billboard.uScreenSpaceX = *((_WORD *)v1 - 1);
+      v2 = *((_WORD *)v1 - 5);
+      billboard.uScreenSpaceY = *(_WORD *)v1;
+      v3 = *((_WORD *)v1 - 10);
       billboard.uParentBillboardID = v0;
-      v4 = *((int *)v1 + 1);
+      v4 = *((_WORD *)v1 + 1);
       billboard.field_10 = v3;
-      v5 = *((int *)v1 - 9);
+      v5 = *((_WORD *)v1 - 9);
       billboard.uTintColor = v4;
-      v6 = *((short *)v1 - 8);
+      v6 = *((_WORD *)v1 - 8);
       billboard.field_14 = v5;
-      v7 = *((int *)v1 - 6);
-      billboard.sZValue = *((int *)v1 - 6);
+      v7 = *((_WORD *)v1 - 6);
+      billboard.sZValue = *((_WORD *)v1 - 6);
       billboard.uFlags = v2;
       if ( v6 != -1 )
       {
-        v8 = *((short *)v1 + 1);
+        v8 = *((_WORD *)v1 + 1);
         if ( pRenderer->pRenderD3D )
         {
           billboard.sZValue = v7;
@@ -2887,22 +2887,22 @@
         else
         {
           if ( *(v1 - 10) & 2 )
-            v9 = PaletteManager::Get_Dark_or_Red_LUT(*((short *)v1 - 7), 0, 1);
+            v9 = PaletteManager::Get_Dark_or_Red_LUT(*((_WORD *)v1 - 7), 0, 1);
           else
-            v9 = GetBillboardPalette((RenderBillboard *)(v1 - 40), *((short *)v1 - 7), v7, *((short *)v1 + 1));
+            v9 = GetBillboardPalette((RenderBillboard *)(v1 - 40), *((_WORD *)v1 - 7), v7, *((_WORD *)v1 + 1));
           v10 = (*(v1 - 9) & 1) == 0;
           billboard.pPalette = v9;
           if ( !v10 )
-            billboard.pPalette = pPaletteManager->field_261600[*((short *)v1 - 7)];
+            billboard.pPalette = pPaletteManager->field_261600[*((_WORD *)v1 - 7)];
           if ( !(billboard.uFlags & 0x40) && billboard.uFlags & 0x80 )
           {
             v11 = GetTickCount();
             v12 = stru_5C6E00->SinCos(v17 + v11);
             v15 = abs(v12);
             v18 = (unsigned __int64)(15i64 * v15) >> 16;
-            billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(*((short *)v1 - 7), 15 - v18, 1);
+            billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(*((_WORD *)v1 - 7), 15 - v18, 1);
           }
-          v13 = *((short *)v1 - 8);
+          v13 = *((_WORD *)v1 - 8);
           if ( v13 >= 0 )
             pSprites_LOD->pSpriteHeaders[v13]._4ACC38(&billboard, 1);
         }
--- a/mm7_4.cpp	Sun Jan 20 21:35:06 2013 +0600
+++ b/mm7_4.cpp	Mon Jan 21 01:06:55 2013 +0600
@@ -3245,7 +3245,7 @@
     if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 )
     {
       pPlayer->field_1AA2 = pFrame->uTextureID - 1;
-      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];
+      pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];
       pPortrait = pFace;
       v9 = pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing[i];
       if ( pParty->pPartyBuffs[11].uExpireTime )