diff mm7_2.cpp @ 728:9f596a163257

Merge
author Nomad
date Fri, 22 Mar 2013 00:06:50 +0200
parents da130dd3092a 9d13d2ec35a6
children de482c901171
line wrap: on
line diff
--- a/mm7_2.cpp	Fri Mar 22 00:02:31 2013 +0200
+++ b/mm7_2.cpp	Fri Mar 22 00:06:50 2013 +0200
@@ -4776,13 +4776,13 @@
     v4 = v24;
   }
   v5 = v2->pTextures;
-  v2->uNumTextures = v4;
+  v2->sNumTextures = v4;
   v6 = pAllocator->AllocNamedChunk(v5, 20 * v4, "Txt Frames");
   v2->pTextures = (TextureFrame *)v6;
   if ( !v6 )
     Abortf("CTextureFrameTable::load - Out of Memory!");
   v7 = File;
-  v2->uNumTextures = 0;
+  v2->sNumTextures = 0;
   fseek(v7, 0, 0);
   for ( i = fgets(&Buf, 490, File); i; i = fgets(&Buf, 490, File) )
   {
@@ -4790,23 +4790,23 @@
     memcpy(&v21, txt_file_frametable_parser(&Buf, &v20), 0x7Cu);
     if ( v21 && *Str1 != 47 )
     {
-      strcpy(v2->pTextures[v2->uNumTextures].pTextureName, Str1);
-      v2->pTextures[v2->uNumTextures].uAnimTime = atoi(Str);
+      strcpy(v2->pTextures[v2->sNumTextures].pTextureName, Str1);
+      v2->pTextures[v2->sNumTextures].uAnimTime = atoi(Str);
       v9 = 2;
-      for ( v2->pTextures[v2->uNumTextures].uFlags = 0; v9 < v21; ++v9 )
+      for ( v2->pTextures[v2->sNumTextures].uFlags = 0; v9 < v21; ++v9 )
       {
         if ( !_strcmpi((&Str1)[4 * v9], "New") )
         {
-          v10 = (int)&v2->pTextures[v2->uNumTextures].uFlags;
+          v10 = (int)&v2->pTextures[v2->sNumTextures].uFlags;
           *(char *)v10 |= 2u;
         }
       }
-      ++v2->uNumTextures;
+      ++v2->sNumTextures;
     }
   }
   fclose(File);
   v11 = 0;
-  if ( (signed int)(v2->uNumTextures - 1) > 0 )
+  if ( (signed int)(v2->sNumTextures - 1) > 0 )
   {
     v12 = 0;
     do
@@ -4817,9 +4817,9 @@
       ++v11;
       ++v12;
     }
-    while ( v11 < (signed int)(v2->uNumTextures - 1) );
-  }
-  for ( j = 0; j < (signed int)v2->uNumTextures; *(short *)(Argsa + 16) = v16 )
+    while ( v11 < (signed int)(v2->sNumTextures - 1) );
+  }
+  for ( j = 0; j < (signed int)v2->sNumTextures; *(short *)(Argsa + 16) = v16 )
   {
     v15 = v2->pTextures;
     Argsa = (int)&v15[j];
@@ -5105,7 +5105,7 @@
       v37 = pIndoor->GetSector(pPosX, a4, v36);
       if ( v37 == pSector )
       {
-        v38 = _46CEC3_get_floor_level(pPosX, a4, a3, v37, &uFaceID);
+        v38 = BLV_GetFloorLevel(pPosX, a4, a3, v37, &uFaceID);
         v39 = v38;
         if ( v38 != -30000 )
         {
@@ -5236,7 +5236,7 @@
       || (v22 = pParty->vPosition.z,
           result = pIndoor->GetSector(v11, v14, pParty->vPosition.z),
           result == v21)
-      && (result = _46CEC3_get_floor_level(v11, v14, v22, result, &uFaceID), result != -30000)
+      && (result = BLV_GetFloorLevel(v11, v14, v22, result, &uFaceID), result != -30000)
       && (result = abs(result - v22), result <= 1024) )
     {
       if ( v20 == uNumActors )
@@ -5548,7 +5548,7 @@
       v19.vPosition.z = pParty->vPosition.z;
       v26 = 0;
       v27 = 0;
-      v19.vPosition.z = sub_46D49E_prolly_get_world_y_under_party(
+      v19.vPosition.z = ODM_GetFloorLevel(
                           v19.vPosition.x,
                           v23 + pParty->vPosition.y,
                           pParty->vPosition.z,
@@ -5606,7 +5606,7 @@
       v17 = pIndoor->GetSector(v19.vPosition.x, v23 + pParty->vPosition.y, pParty->vPosition.z);
       if ( v17 == v22 )
       {
-        v18 = _46CEC3_get_floor_level(v19.vPosition.x, v19.vPosition.y, v19.vPosition.z, v17, &uFaceID);
+        v18 = BLV_GetFloorLevel(v19.vPosition.x, v19.vPosition.y, v19.vPosition.z, v17, &uFaceID);
         v19.vPosition.z = v18;
         if ( v18 != -30000 )
         {
@@ -11929,7 +11929,7 @@
         if ( pParty->pPickedItem.uItemID )
           return 1;
         v24 = (int)pItemsTable->pItems[v20].pUnidentifiedName;
-        sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v24);
+        sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[471], v24);
         ShowStatusBarString(pTmpBuf2, 2u);
         if ( v19->uItemID == 506 )
           _449B7E_toggle_bit(pParty->_quest_bits, 184, 1u);