# HG changeset patch # User Grumpy7 # Date 1381210860 -7200 # Node ID 49a4db499c0ac43522c2d07a19bebac653e665b7 # Parent af7f08135ffbb39a93775c4c84e742e01de55d09 dword_5B65C4 to cancelEventProcessing diff -r af7f08135ffb -r 49a4db499c0a Events.cpp --- a/Events.cpp Tue Oct 08 07:10:00 2013 +0200 +++ b/Events.cpp Tue Oct 08 07:41:00 2013 +0200 @@ -426,7 +426,7 @@ //v131 = uEventID; v133 = 0; EvtTargetObj = targetObj; - dword_5B65C4 = 0; + cancelEventProcessing = 0; if ( !uEventID ) { if ( !GameUI_Footer_TimeLeft ) @@ -457,7 +457,7 @@ //v7 = ""; while ( 1 ) { - if ( dword_5B65C4 ) + if ( cancelEventProcessing ) goto LABEL_301; //v8 = v4; if ( pSomeEVT_Events[v4].uEventID == uEventID && pSomeEVT_Events[v4].event_sequence_num == curr_seq_num ) diff -r af7f08135ffb -r 49a4db499c0a Player.cpp --- a/Player.cpp Tue Oct 08 07:10:00 2013 +0200 +++ b/Player.cpp Tue Oct 08 07:41:00 2013 +0200 @@ -6663,7 +6663,7 @@ case VAR_FixedGold: if ( (unsigned int)pValue > pParty->uNumGold ) { - dword_5B65C4 = 1; + cancelEventProcessing = 1; return; } Party::TakeGold((unsigned int)pValue); @@ -7105,7 +7105,7 @@ } else { - dword_5B65C4 = 1; + cancelEventProcessing = 1; } return; case VAR_NumDeaths: diff -r af7f08135ffb -r 49a4db499c0a mm7_data.cpp --- a/mm7_data.cpp Tue Oct 08 07:10:00 2013 +0200 +++ b/mm7_data.cpp Tue Oct 08 07:41:00 2013 +0200 @@ -1053,7 +1053,7 @@ int _5B65B8_npcdata_hiword_house_or_other; // weak int dword_5B65BC; // weak int dword_5B65C0; // weak -int dword_5B65C4; // weak +int cancelEventProcessing; // weak int dword_5B65C8_timers_count; // weak int npcIdToDismissAfterDialogue; // weak signed int dword_5B65D0_dialogue_actor_npc_id; // weak diff -r af7f08135ffb -r 49a4db499c0a mm7_data.h --- a/mm7_data.h Tue Oct 08 07:10:00 2013 +0200 +++ b/mm7_data.h Tue Oct 08 07:41:00 2013 +0200 @@ -701,7 +701,7 @@ extern int _5B65B8_npcdata_hiword_house_or_other; // weak extern int dword_5B65BC; // weak extern int dword_5B65C0; // weak -extern int dword_5B65C4; // weak +extern int cancelEventProcessing; // weak extern int dword_5B65C8_timers_count; // weak extern int npcIdToDismissAfterDialogue; // weak extern int dword_5B65D0_dialogue_actor_npc_id; // weak