Mercurial > mm7
comparison mm7_5.cpp @ 720:05f7a11f4f20
Слияние
author | Ritor1 |
---|---|
date | Tue, 19 Mar 2013 23:41:29 +0600 |
parents | a5ee769b02c6 a9c1fb7483c2 |
children | 70c5a87a1307 |
comparison
equal
deleted
inserted
replaced
719:d394cc892106 | 720:05f7a11f4f20 |
---|---|
2282 strcpy((char *)pKeyActionMap->pPressedKeysBuffer, "2"); | 2282 strcpy((char *)pKeyActionMap->pPressedKeysBuffer, "2"); |
2283 goto LABEL_524; | 2283 goto LABEL_524; |
2284 case UIMSG_DD: | 2284 case UIMSG_DD: |
2285 LABEL_524: | 2285 LABEL_524: |
2286 sprintf(pTmpBuf, "%s", pKeyActionMap->pPressedKeysBuffer); | 2286 sprintf(pTmpBuf, "%s", pKeyActionMap->pPressedKeysBuffer); |
2287 memcpy(&v216, texture_frame_table_txt_parser((const char *)pKeyActionMap->pPressedKeysBuffer, &v218), sizeof(v216)); | 2287 memcpy(&v216, txt_file_frametable_parser((const char *)pKeyActionMap->pPressedKeysBuffer, &v218), sizeof(v216)); |
2288 if ( v216.field_0 == 1 ) | 2288 if ( v216.uPropCount == 1 ) |
2289 { | 2289 { |
2290 pNPCData4 = (NPCData *)((signed int)pGames_LOD->uNumSubIndices / 2); | 2290 pNPCData4 = (NPCData *)((signed int)pGames_LOD->uNumSubIndices / 2); |
2291 v70 = atoi(v216.pProperties[0]); | 2291 v70 = atoi(v216.pProperties[0]); |
2292 if ( v70 <= 0 || v70 >= 77 ) | 2292 if ( v70 <= 0 || v70 >= 77 ) |
2293 { | 2293 { |
2326 sprintf(Str2, "No map found for %s", pMapStats->pInfos[v71].pName); | 2326 sprintf(Str2, "No map found for %s", pMapStats->pInfos[v71].pName); |
2327 v73 = Str2; | 2327 v73 = Str2; |
2328 } | 2328 } |
2329 else | 2329 else |
2330 { | 2330 { |
2331 if ( v216.field_0 != 3 ) | 2331 if ( v216.uPropCount != 3 ) |
2332 //goto LABEL_90; | 2332 //goto LABEL_90; |
2333 { | 2333 { |
2334 v1 = ""; | 2334 v1 = ""; |
2335 v0 = 1; | 2335 v0 = 1; |
2336 continue; | 2336 continue; |