Mercurial > mm7
changeset 1825:23deb6b09c8c
cancelEventProcessing to dword_5B65C4_cancelEventProcessing
| author | Grumpy7 |
|---|---|
| date | Wed, 09 Oct 2013 08:39:49 +0200 |
| parents | 6788e58c1715 |
| children | bdac32c645c5 |
| files | Events.cpp Player.cpp mm7_data.cpp mm7_data.h |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Events.cpp Wed Oct 09 08:29:23 2013 +0200 +++ b/Events.cpp Wed Oct 09 08:39:49 2013 +0200 @@ -426,7 +426,7 @@ //v131 = uEventID; v133 = 0; EvtTargetObj = targetObj; - cancelEventProcessing = 0; + dword_5B65C4_cancelEventProcessing = 0; if ( !uEventID ) { if ( !GameUI_Footer_TimeLeft ) @@ -457,7 +457,7 @@ //v7 = ""; while ( 1 ) { - if ( cancelEventProcessing ) + if ( dword_5B65C4_cancelEventProcessing ) goto LABEL_301; //v8 = v4; if ( pSomeEVT_Events[v4].uEventID == uEventID && pSomeEVT_Events[v4].event_sequence_num == curr_seq_num )
--- a/Player.cpp Wed Oct 09 08:29:23 2013 +0200 +++ b/Player.cpp Wed Oct 09 08:39:49 2013 +0200 @@ -6664,7 +6664,7 @@ case VAR_FixedGold: if ( (unsigned int)pValue > pParty->uNumGold ) { - cancelEventProcessing = 1; + dword_5B65C4_cancelEventProcessing = 1; return; } Party::TakeGold((unsigned int)pValue); @@ -7109,7 +7109,7 @@ } else { - cancelEventProcessing = 1; + dword_5B65C4_cancelEventProcessing = 1; } return; case VAR_NumDeaths:
--- a/mm7_data.cpp Wed Oct 09 08:29:23 2013 +0200 +++ b/mm7_data.cpp Wed Oct 09 08:39:49 2013 +0200 @@ -1052,7 +1052,7 @@ int _5B65B8_npcdata_hiword_house_or_other; // weak int dword_5B65BC; // weak int dword_5B65C0; // weak -int cancelEventProcessing; // weak +int dword_5B65C4_cancelEventProcessing; // weak int dword_5B65C8_timers_count; // weak int npcIdToDismissAfterDialogue; // weak signed int dword_5B65D0_dialogue_actor_npc_id; // weak
--- a/mm7_data.h Wed Oct 09 08:29:23 2013 +0200 +++ b/mm7_data.h Wed Oct 09 08:39:49 2013 +0200 @@ -700,7 +700,7 @@ extern int _5B65B8_npcdata_hiword_house_or_other; // weak extern int dword_5B65BC; // weak extern int dword_5B65C0; // weak -extern int cancelEventProcessing; // weak +extern int dword_5B65C4_cancelEventProcessing; // weak extern int dword_5B65C8_timers_count; // weak extern int npcIdToDismissAfterDialogue; // weak extern int dword_5B65D0_dialogue_actor_npc_id; // weak