diff options
Diffstat (limited to 'engines/tinsel/events.cpp')
| -rw-r--r-- | engines/tinsel/events.cpp | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp index e701ddca99..74454c5f2a 100644 --- a/engines/tinsel/events.cpp +++ b/engines/tinsel/events.cpp @@ -54,37 +54,37 @@ extern HPOLYGON GetTaggedPoly(); //----------------- EXTERNAL GLOBAL DATA --------------------- -extern bool bEnableMenu; +extern bool g_bEnableMenu; //----------------- LOCAL GLOBAL DATA -------------------- // FIXME: Avoid non-const global vars -static uint32 lastUserEvent = 0; // Time it hapenned -static int leftEvents = 0; // Single or double, left or right. Or escape key. -static int escEvents = 1; // Escape key -static int userEvents = 0; // Whenever a button or a key comes in +static uint32 g_lastUserEvent = 0; // Time it hapenned +static int g_leftEvents = 0; // Single or double, left or right. Or escape key. +static int g_escEvents = 1; // Escape key +static int g_userEvents = 0; // Whenever a button or a key comes in -static int eCount = 0; +static int g_eCount = 0; -static int controlState; -static bool bStartOff; +static int g_controlState; +static bool g_bStartOff; -static int controlX, controlY; -static bool bProvNotProcessed = false; +static int g_controlX, g_controlY; +static bool g_bProvNotProcessed = false; /** * Gets called before each schedule, only 1 user action per schedule * is allowed. */ void ResetEcount() { - eCount = 0; + g_eCount = 0; } void IncUserEvents() { - userEvents++; - lastUserEvent = DwGetCurrentTime(); + g_userEvents++; + g_lastUserEvent = DwGetCurrentTime(); } /** @@ -104,7 +104,7 @@ void AllowDclick(CORO_PARAM, PLR_EVENT be) { FreeToken(TOKEN_LEFT_BUT); // Prevent activation of 2 events on the same tick - if (++eCount != 1) + if (++g_eCount != 1) CORO_KILL_SELF(); break; @@ -125,17 +125,17 @@ void ControlOn() { return; } - bEnableMenu = false; + g_bEnableMenu = false; - if (controlState == CONTROL_OFF) { + if (g_controlState == CONTROL_OFF) { // Control is on - controlState = CONTROL_ON; + g_controlState = CONTROL_ON; // Restore cursor to where it was - if (bStartOff == true) - bStartOff = false; + if (g_bStartOff == true) + g_bStartOff = false; else - SetCursorXY(controlX, controlY); + SetCursorXY(g_controlX, g_controlY); // Re-instate cursor UnHideCursor(); @@ -155,14 +155,14 @@ void ControlOff() { return; } - bEnableMenu = false; + g_bEnableMenu = false; - if (controlState == CONTROL_ON) { + if (g_controlState == CONTROL_ON) { // Control is off - controlState = CONTROL_OFF; + g_controlState = CONTROL_OFF; // Store cursor position - GetCursorXY(&controlX, &controlY, true); + GetCursorXY(&g_controlX, &g_controlY, true); // Blank out cursor DwHideCursor(); @@ -181,10 +181,10 @@ void ControlStartOff() { return; } - bEnableMenu = false; + g_bEnableMenu = false; // Control is off - controlState = CONTROL_OFF; + g_controlState = CONTROL_OFF; // Blank out cursor DwHideCursor(); @@ -192,7 +192,7 @@ void ControlStartOff() { // Switch off tags DisableTags(); - bStartOff = true; + g_bStartOff = true; } /** @@ -211,7 +211,7 @@ bool GetControl(int param) { } bool GetControl() { - if (controlState == CONTROL_ON) { + if (g_controlState == CONTROL_ON) { ControlOff(); return true; } else @@ -220,7 +220,7 @@ bool GetControl() { bool ControlIsOn() { if (TinselV2) - return (controlState == CONTROL_ON); + return (g_controlState == CONTROL_ON); return TestToken(TOKEN_CONTROL); } @@ -289,7 +289,7 @@ static void ProcessUserEvent(TINSEL_EVENT uEvent, const Common::Point &coOrds, P HPOLYGON hPoly; // Prevent activation of 2 events on the same tick - if (++eCount != 1) + if (++g_eCount != 1) return; if ((actor = GetTaggedActor()) != 0) { @@ -395,19 +395,19 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) { static uint32 lastRealAction = 0; // FIXME: Avoid non-const global vars // This stuff to allow F1 key during startup. - if (bEnableMenu && pEvent == PLR_MENU) + if (g_bEnableMenu && pEvent == PLR_MENU) Control(CONTROL_ON); else IncUserEvents(); if (pEvent == PLR_ESCAPE) { - ++escEvents; - ++leftEvents; // Yes, I do mean this + ++g_escEvents; + ++g_leftEvents; // Yes, I do mean this } else if ((pEvent == PLR_PROV_WALKTO) || (pEvent == PLR_WALKTO) || (pEvent == PLR_LOOK) || (pEvent == PLR_ACTION)) { - ++leftEvents; + ++g_leftEvents; } // Only allow events if player control is on @@ -484,18 +484,18 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) { * For ESCapable Glitter sequences */ int GetEscEvents() { - return escEvents; + return g_escEvents; } /** * For cutting short talk()s etc. */ int GetLeftEvents() { - return leftEvents; + return g_leftEvents; } bool LeftEventChange(int myleftEvent) { - if (leftEvents != myleftEvent) { + if (g_leftEvents != myleftEvent) { ProcessedProvisional(); return true; } else @@ -506,15 +506,15 @@ bool LeftEventChange(int myleftEvent) { * For waitkey() Glitter function */ int getUserEvents() { - return userEvents; + return g_userEvents; } uint32 getUserEventTime() { - return DwGetCurrentTime() - lastUserEvent; + return DwGetCurrentTime() - g_lastUserEvent; } void resetUserEventTime() { - lastUserEvent = DwGetCurrentTime(); + g_lastUserEvent = DwGetCurrentTime(); } struct PTP_INIT { @@ -655,18 +655,18 @@ void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor) { * subsequent 'real' event. */ void ProcessedProvisional() { - bProvNotProcessed = false; + g_bProvNotProcessed = false; } /** * Resets the bProvNotProcessed flag */ void ProvNotProcessed() { - bProvNotProcessed = true; + g_bProvNotProcessed = true; } bool GetProvNotProcessed() { - return bProvNotProcessed; + return g_bProvNotProcessed; } } // End of namespace Tinsel |