diff --git a/GpApp/GameOver.cpp b/GpApp/GameOver.cpp index dc8d73f..cd3c362 100644 --- a/GpApp/GameOver.cpp +++ b/GpApp/GameOver.cpp @@ -163,7 +163,7 @@ void DoGameOverStarAnimation (void) nextLoop = TickCount() + 2; count = 0; pass = 0; - FlushEvents(everyEvent, 0); + FlushEvents(); if (workSrcRect.bottom - angelDest.bottom > kMaxFramesAlive * starFallSpeed) starFallSpeed = (workSrcRect.bottom - angelDest.bottom + kMaxFramesAlive - 1) / kMaxFramesAlive; @@ -465,7 +465,7 @@ void DoDiedGameOver (void) InitDiedGameOver(); CopyRectMainToWork(&workSrcRect); CopyRectMainToBack(&workSrcRect); - FlushEvents(everyEvent, 0); + FlushEvents(); nextLoop = TickCount() + 2; while (pagesStuck < 8) diff --git a/GpApp/HighScores.cpp b/GpApp/HighScores.cpp index de0a85c..7645398 100644 --- a/GpApp/HighScores.cpp +++ b/GpApp/HighScores.cpp @@ -397,7 +397,7 @@ Boolean TestHighScore (void) else if (scoreTimestamp > 0xffffffff) scoreTimestamp = 0xffffffff; - FlushEvents(everyEvent, 0); + FlushEvents(); GetHighScoreName(placing + 1); PasStringCopy(highName, thisHousePtr->highScores.names[kMaxScores - 1]); if (placing == 0) @@ -503,7 +503,7 @@ void GetHighScoreName (short place) PlayPrioritySound(kEnergizeSound, kEnergizePriority); BringUpDialog(&theDial, kHighNameDialogID, &substitutions); - FlushEvents(everyEvent, 0); + FlushEvents(); SetDialogString(theDial, kHighNameItem, highName); SelectDialogItemText(theDial, kHighNameItem, 0, 1024); leaving = false; diff --git a/GpApp/Input.cpp b/GpApp/Input.cpp index f7e9888..ef6d5cd 100644 --- a/GpApp/Input.cpp +++ b/GpApp/Input.cpp @@ -468,7 +468,7 @@ Boolean QuerySaveGame (void) short hitWhat; InitCursor(); - FlushEvents(everyEvent, 0); + FlushEvents(); // CenterAlert(kSaveGameAlert); hitWhat = PortabilityLayer::DialogManager::GetInstance()->DisplayAlert(kSaveGameAlert, nullptr); if (hitWhat == kYesSaveGameButton) diff --git a/GpApp/Main.cpp b/GpApp/Main.cpp index c4c500c..60cd7c6 100644 --- a/GpApp/Main.cpp +++ b/GpApp/Main.cpp @@ -396,7 +396,7 @@ int gpAppMain() } WriteOutPrefs(); RestoreColorDepth(); - PL_DEAD(FlushEvents(everyEvent, 0)); + PL_DEAD(FlushEvents()); // theErr = LoadScrap(); return 0; diff --git a/GpApp/SavedGames.cpp b/GpApp/SavedGames.cpp index 266f1dc..add4da7 100644 --- a/GpApp/SavedGames.cpp +++ b/GpApp/SavedGames.cpp @@ -54,7 +54,7 @@ void SaveGame2 (void) PortabilityLayer::MemoryManager *mm = PortabilityLayer::MemoryManager::GetInstance(); PortabilityLayer::FileManager *fm = PortabilityLayer::FileManager::GetInstance(); - FlushEvents(everyEvent, 0); + FlushEvents(); thisHousePtr = *thisHouse; diff --git a/GpApp/Settings.cpp b/GpApp/Settings.cpp index 64cc294..38ed0a3 100644 --- a/GpApp/Settings.cpp +++ b/GpApp/Settings.cpp @@ -1270,7 +1270,7 @@ void DoSettingsMain (void) FlashSettingsButton(surface, 1); DoSoundPrefs(); SetGraphicsPort(prefDlg->GetWindow()->GetDrawSurface()); - FlushEvents(everyEvent, 0); + FlushEvents(); break; case kControlsButton: diff --git a/GpApp/Utilities.cpp b/GpApp/Utilities.cpp index 26773dc..fbff448 100644 --- a/GpApp/Utilities.cpp +++ b/GpApp/Utilities.cpp @@ -424,7 +424,7 @@ Boolean WaitForInputEvent (short seconds) Boolean waiting, didResume; timeToBail = TickCount() + 60L * (long)seconds; - FlushEvents(everyEvent, 0); + FlushEvents(); waiting = true; didResume = false; @@ -446,7 +446,7 @@ Boolean WaitForInputEvent (short seconds) Delay(1, nullptr); } - FlushEvents(everyEvent, 0); + FlushEvents(); return (didResume); } @@ -469,7 +469,7 @@ void WaitCommandQReleased (void) Delay(1, nullptr); } - FlushEvents(everyEvent, 0); + FlushEvents(); } //-------------------------------------------------------------- KeyMapOffsetFromRawKey diff --git a/PortabilityLayer/PLCore.cpp b/PortabilityLayer/PLCore.cpp index c8cbcad..7c8c574 100644 --- a/PortabilityLayer/PLCore.cpp +++ b/PortabilityLayer/PLCore.cpp @@ -547,7 +547,7 @@ void GetTime(DateTimeRec *dateTime) dateTime->minute = minute; } -void FlushEvents(int mask, int unknown) +void FlushEvents() { PortabilityLayer::EventQueue *queue = PortabilityLayer::EventQueue::GetInstance(); diff --git a/PortabilityLayer/PLCore.h b/PortabilityLayer/PLCore.h index 7f2ba48..0ba4f3d 100644 --- a/PortabilityLayer/PLCore.h +++ b/PortabilityLayer/PLCore.h @@ -204,11 +204,6 @@ typedef WindowPtr WindowRef; // wtf? struct KeyDownStates; -static const int everyEvent = -1; - -static const int iBeamCursor = 1; -static const int watchCursor = 4; - static const Boolean TRUE = 1; static const Boolean FALSE = 0; @@ -216,8 +211,6 @@ static const Boolean FALSE = 0; static const int nullEvent = 0; -//void FlushEvents(int eventMask, int stopMask); - void InitCursor(); void HideCursor(); @@ -261,7 +254,7 @@ Boolean WaitMouseUp(); short Random(); void GetTime(DateTimeRec *dateTime); -void FlushEvents(int mask, int unknown); +void FlushEvents(); Handle NewHandle(Size size); long GetHandleSize(Handle handle);