Mercurial > mm7

comparison Events.cpp @ 2487:0683c0a38282

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
in LoadTextureFromLOD() func
author Ritor1
date Thu, 11 Sep 2014 17:26:19 +0600
parents b054ea5daf45
children 5abd8fc8f1c6
comparison
equal deleted inserted replaced
2482:d58599b6306b 2487:0683c0a38282
33 #include "Events.h" 33 #include "Events.h"
34 #include "Events2D.h" 34 #include "Events2D.h"
35 #include "UI\UIHouses.h" 35 #include "UI\UIHouses.h"
36 #include "MM7.h" 36 #include "MM7.h"
37 #include "Level/Decoration.h" 37 #include "Level/Decoration.h"
38 38 #include "LuaVM.h"
39 #include "Log.h"
39 #include "DecorationList.h" 40 #include "DecorationList.h"
40 41
41 42
42 std::array<EventIndex, 4400> pSomeOtherEVT_Events; 43 std::array<EventIndex, 4400> pSomeOtherEVT_Events;
43 signed int uSomeOtherEVT_NumEvents; 44 signed int uSomeOtherEVT_NumEvents;
347 Actor Dst; // [sp+164h] [bp-344h]@53 348 Actor Dst; // [sp+164h] [bp-344h]@53
348 349
349 v133 = 0; 350 v133 = 0;
350 EvtTargetObj = targetObj; 351 EvtTargetObj = targetObj;
351 dword_5B65C4_cancelEventProcessing = 0; 352 dword_5B65C4_cancelEventProcessing = 0;
352 /*if ( uEventID == 114 )//for test script 353 if ( uEventID == 114 )//for test script
353 { 354 {
354 if (!lua->DoFile("out01.lua")) 355 if (!lua->DoFile("out01.lua"))
355 Log::Warning(L"Error opening out01.lua\n"); 356 Log::Warning(L"Error opening out01.lua\n");
356 Log::Warning(L"being tested that well\n"); 357 Log::Warning(L"being tested that well\n");
357 return; 358 return;
358 } */ 359 }
359 if ( !uEventID ) 360 if ( !uEventID )
360 { 361 {
361 if ( !GameUI_Footer_TimeLeft ) 362 if ( !GameUI_Footer_TimeLeft )
362 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here 363 ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here
363 return; 364 return;