Mercurial > mm7

comparison Events.cpp @ 2056:a35d173cd99c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Sat, 30 Nov 2013 20:09:04 +0600
parents 71a814f4482a
children f7e5b9f236ae
comparison
equal deleted inserted replaced
2055:95e9a5141338 2056:a35d173cd99c
31 #include "Events2D.h" 31 #include "Events2D.h"
32 #include "UI\UIHouses.h" 32 #include "UI\UIHouses.h"
33 #include "Log.h" 33 #include "Log.h"
34 #include "MM7.h" 34 #include "MM7.h"
35 #include "Level/Decoration.h" 35 #include "Level/Decoration.h"
36 #include "LuaClass.h" 36 #include "LuaVM.h"
37 37
38 38
39 39
40 std::array<EventIndex, 4400> pSomeOtherEVT_Events; 40 std::array<EventIndex, 4400> pSomeOtherEVT_Events;
41 signed int uSomeOtherEVT_NumEvents; 41 signed int uSomeOtherEVT_NumEvents;
429 v133 = 0; 429 v133 = 0;
430 EvtTargetObj = targetObj; 430 EvtTargetObj = targetObj;
431 dword_5B65C4_cancelEventProcessing = 0; 431 dword_5B65C4_cancelEventProcessing = 0;
432 if ( uEventID == 114 ) 432 if ( uEventID == 114 )
433 { 433 {
434 if ( pMM_lua->DoFile("out01.lua") ) 434 if (!lua->DoFile("out01.lua"))
435 Log::Warning(L"Error opening out01.lua\n"); 435 Log::Warning(L"Error opening out01.lua\n");
436 } 436 }
437 if ( !uEventID ) 437 if ( !uEventID )
438 { 438 {
439 if ( !GameUI_Footer_TimeLeft ) 439 if ( !GameUI_Footer_TimeLeft )