comparison mm7_4.cpp @ 788:f004c7ceb7bd

Слияние
author Ritor1
date Mon, 25 Mar 2013 02:21:14 +0600
parents da80bd2922df b3e08a496778
children 346f7069676a
comparison
equal deleted inserted replaced
787:3a77fbf7d0b8 788:f004c7ceb7bd
54 #include "Log.h" 54 #include "Log.h"
55 #include "UIHouses.h" 55 #include "UIHouses.h"
56 #include "mm7_data.h" 56 #include "mm7_data.h"
57 57
58 //----- (0046CC4B) -------------------------------------------------------- 58 //----- (0046CC4B) --------------------------------------------------------
59 void __cdecl _46CC4B_check_event_triggers() 59 void __cdecl check_event_triggers()
60 { 60 {
61 int v0; // eax@1 61 int v0; // eax@1
62 LevelDecoration *v1; // esi@2 62 LevelDecoration *v1; // esi@2
63 signed int v2; // edi@2 63 signed int v2; // edi@2
64 int v3; // ebx@2 64 int v3; // ebx@2
2516 v14 = pPlayers[v12]; 2516 v14 = pPlayers[v12];
2517 v15 = (double)pPlayers[v12]->GetMaxHealth() * 0.1; 2517 v15 = (double)pPlayers[v12]->GetMaxHealth() * 0.1;
2518 v14->ReceiveDamage((signed __int64)v15, 0); 2518 v14->ReceiveDamage((signed __int64)v15, 0);
2519 if ( pParty->uFlags & 4 ) 2519 if ( pParty->uFlags & 4 )
2520 { 2520 {
2521 strcpy(GameUI_StatusBar_TimedString, pGlobalTXT_LocalizationStrings[660]); 2521 strcpy(GameUI_Footer_TimedString, pGlobalTXT_LocalizationStrings[660]);
2522 GameUI_StatusBar_TimedStringTimeLeft = 128; 2522 GameUI_Footer_TimeLeft = 128;
2523 } 2523 }
2524 goto LABEL_39; 2524 goto LABEL_39;
2525 } 2525 }
2526 v13 = pPlayers[v12]; 2526 v13 = pPlayers[v12];
2527 } 2527 }
2545 v17 = *v16; 2545 v17 = *v16;
2546 v18 = (double)(*v16)->GetMaxHealth() * 0.1; 2546 v18 = (double)(*v16)->GetMaxHealth() * 0.1;
2547 v17->ReceiveDamage((signed __int64)v18, 0); 2547 v17->ReceiveDamage((signed __int64)v18, 0);
2548 if ( pParty->uFlags & 0x200 ) 2548 if ( pParty->uFlags & 0x200 )
2549 { 2549 {
2550 strcpy(GameUI_StatusBar_TimedString, pGlobalTXT_LocalizationStrings[661]); 2550 strcpy(GameUI_Footer_TimedString, pGlobalTXT_LocalizationStrings[661]);
2551 GameUI_StatusBar_TimedStringTimeLeft = 128; 2551 GameUI_Footer_TimeLeft = 128;
2552 } 2552 }
2553 ++v16; 2553 ++v16;
2554 } 2554 }
2555 while ( (signed int)v16 <= (signed int)&pPlayers[4] ); 2555 while ( (signed int)v16 <= (signed int)&pPlayers[4] );
2556 } 2556 }