diff mm7_4.cpp @ 316:922a96fdcc86

Merge
author Nomad
date Wed, 20 Feb 2013 01:21:19 +0200
parents 2a09e1d6fc8f 72faa54ff319
children 15decc249a94
line wrap: on
line diff
--- a/mm7_4.cpp	Wed Feb 20 01:17:13 2013 +0200
+++ b/mm7_4.cpp	Wed Feb 20 01:21:19 2013 +0200
@@ -5740,16 +5740,13 @@
   pTexture_IC_KNIGHT[8] = pIcons_LOD->LoadTexturePtr("IC_SORC", TEXTURE_16BIT_PALETTE);
   pTexture_MAKETOP = pIcons_LOD->LoadTexturePtr("MAKETOP", TEXTURE_16BIT_PALETTE);
   pTexture_MAKESKY = pIcons_LOD->LoadTexturePtr("MAKESKY", TEXTURE_16BIT_PALETTE);
-  uX = 0;
-  do // load PlayerPortraits texture
+  for(uX=0;uX < 22;++uX ) // load PlayerPortraits texture
   {
     sprintf(pTmpBuf, "%s01", pPlayerPortraitsNames[uX]);
     v1 = pIcons_LOD->LoadTexture(pTmpBuf, TEXTURE_16BIT_PALETTE);
-    v2 = uX * 4;
-    ++uX;
-    *(Texture **)((char *)pPlayerPortraits + v2) = &pIcons_LOD->pTextures[v1];
-  }
-  while ( uX < 22 );
+    pPlayerPortraits[uX] = &pIcons_LOD->pTextures[v1];
+
+  }
   pTexture_PlayerFaceMask = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("FACEMASK", TEXTURE_16BIT_PALETTE)];
   pTexture_buttminu  = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttminu", TEXTURE_16BIT_PALETTE)];
   pTexture_buttplus  = &pIcons_LOD->pTextures[pIcons_LOD->LoadTexture("buttplus", TEXTURE_16BIT_PALETTE)];
@@ -14722,7 +14719,7 @@
   }
   else
   {
-    v2 = (char *)&pLevelEVT_Events[0].uEventOffsetInEVT;
+    v2 = (char *)&pLevelEVT_Index[0].uEventOffsetInEVT;
     while ( 1 )
     {
       if ( *((int *)v2 - 2) == uEventID )
@@ -14748,7 +14745,7 @@
     }
     else
     {
-      for ( i = (char *)pLevelEVT_Events + 4 * (3 * v1 + 3); *(int *)i == uEventID; i += 12 )
+      for ( i = (char *)pLevelEVT_Index + 4 * (3 * v1 + 3); *(int *)i == uEventID; i += 12 )
       {
         v8 = *((int *)i + 2);
         if ( pLevelEVT[v8 + 4] == 2 )