diff mm7_1.cpp @ 237:2799737f8a74

more text parsers refactor
author Gloval
date Mon, 18 Feb 2013 00:47:36 +0400
parents c879446b4a22
children b070b83a897b
line wrap: on
line diff
--- a/mm7_1.cpp	Sun Feb 17 18:50:35 2013 +0400
+++ b/mm7_1.cpp	Mon Feb 18 00:47:36 2013 +0400
@@ -3186,7 +3186,7 @@
     v38 = v121->dword_000334_unique_name;
     v77 = 2000;
     if ( v38 )
-      v72 = (char *)*(&pMonsterStats->pPlacement.uNumStrings + v38);
+      v72 = pMonsterStats->pPlaceStrings[v38];
     else
       v72 = pMonsterStats->pInfos[v121->pMonsterInfo.uID].pName;
   }
@@ -4392,7 +4392,7 @@
   v2 = pMapStats->GetMapInfo(pCurrentMapName);
   if ( !(*v1 & 1) || !v2 )
     goto LABEL_12;
-  if ( pPlayers[uActiveCharacter]->GetDisarmTrap() < 2 * pMapStats->pInfos[v2].field_2D )
+  if ( pPlayers[uActiveCharacter]->GetDisarmTrap() < 2 * pMapStats->pInfos[v2].LockX5 )
   {
     v29 = 811;
     v30 = 812;
@@ -5184,7 +5184,7 @@
       v28 = pTmpBuf;
       v29 = pActor->dword_000334_unique_name;
       if ( v29 )
-        v40 = (char *)*(&pMonsterStats->pPlacement.uNumStrings + v29);
+        v40 = pMonsterStats->pPlaceStrings[v29];
       else
         v40 = pMonsterStats->pInfos[pActor->pMonsterInfo.uID].pName;
       strncpy(pTmpBuf, v40, 0x7D0u);