Mercurial > mm7

diff mm7_4.cpp @ 788:f004c7ceb7bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 25 Mar 2013 02:21:14 +0600
parents da80bd2922df b3e08a496778
children 346f7069676a
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Mar 25 02:20:57 2013 +0600
+++ b/mm7_4.cpp	Mon Mar 25 02:21:14 2013 +0600
@@ -56,7 +56,7 @@
 #include "mm7_data.h"
 
 //----- (0046CC4B) --------------------------------------------------------
-void __cdecl _46CC4B_check_event_triggers()
+void __cdecl check_event_triggers()
 {
   int v0; // eax@1
   LevelDecoration *v1; // esi@2
@@ -2518,8 +2518,8 @@
           v14->ReceiveDamage((signed __int64)v15, 0);
           if ( pParty->uFlags & 4 )
           {
-            strcpy(GameUI_StatusBar_TimedString, pGlobalTXT_LocalizationStrings[660]);
-            GameUI_StatusBar_TimedStringTimeLeft = 128;
+            strcpy(GameUI_Footer_TimedString, pGlobalTXT_LocalizationStrings[660]);
+            GameUI_Footer_TimeLeft = 128;
           }
           goto LABEL_39;
         }
@@ -2547,8 +2547,8 @@
       v17->ReceiveDamage((signed __int64)v18, 0);
       if ( pParty->uFlags & 0x200 )
       {
-        strcpy(GameUI_StatusBar_TimedString, pGlobalTXT_LocalizationStrings[661]);
-        GameUI_StatusBar_TimedStringTimeLeft = 128;
+        strcpy(GameUI_Footer_TimedString, pGlobalTXT_LocalizationStrings[661]);
+        GameUI_Footer_TimeLeft = 128;
       }
       ++v16;
     }