diff mm7_5.cpp @ 720:05f7a11f4f20

Слияние
author Ritor1
date Tue, 19 Mar 2013 23:41:29 +0600
parents a5ee769b02c6 a9c1fb7483c2
children 70c5a87a1307
line wrap: on
line diff
--- a/mm7_5.cpp	Tue Mar 19 23:41:14 2013 +0600
+++ b/mm7_5.cpp	Tue Mar 19 23:41:29 2013 +0600
@@ -2284,8 +2284,8 @@
         case UIMSG_DD:
 LABEL_524:
           sprintf(pTmpBuf, "%s", pKeyActionMap->pPressedKeysBuffer);
-          memcpy(&v216, texture_frame_table_txt_parser((const char *)pKeyActionMap->pPressedKeysBuffer, &v218), sizeof(v216));
-          if ( v216.field_0 == 1 )
+          memcpy(&v216, txt_file_frametable_parser((const char *)pKeyActionMap->pPressedKeysBuffer, &v218), sizeof(v216));
+          if ( v216.uPropCount == 1 )
           {
             pNPCData4 = (NPCData *)((signed int)pGames_LOD->uNumSubIndices / 2);
             v70 = atoi(v216.pProperties[0]);
@@ -2328,7 +2328,7 @@
           }
           else
           {
-            if ( v216.field_0 != 3 )
+            if ( v216.uPropCount != 3 )
               //goto LABEL_90;
             {
               v1 = "";