From 19166f80d0a7fff5fb4b43b66217aa24d4eb2ada Mon Sep 17 00:00:00 2001 From: Clownacy Date: Fri, 21 Jun 2019 11:02:20 +0000 Subject: [PATCH] Correct some misdecompiled switchcases --- src/Game.cpp | 60 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/src/Game.cpp b/src/Game.cpp index 2f9bbf75..ddbcf50c 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -140,11 +140,13 @@ int ModeOpening() // Escape menu if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } // Skip intro if OK is pressed @@ -182,11 +184,13 @@ int ModeOpening() PutFade(); // Update Text Script - int tscRet = TextScriptProc(); - if (tscRet == 0) - return 0; - if (tscRet == 2) - return 1; + switch (TextScriptProc()) + { + case 0: + return 0; + case 2: + return 1; + } PutMapName(FALSE); PutTextScript(); @@ -334,11 +338,13 @@ int ModeTitle() if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } // Move cursor @@ -478,11 +484,13 @@ int ModeAction() // Escape menu if (gKey & KEY_ESCAPE) { - int escRet = Call_Escape(ghWnd); - if (escRet == 0) - return 0; - if (escRet == 2) - return 1; + switch (Call_Escape(ghWnd)) + { + case 0: + return 0; + case 2: + return 1; + } } if (swPlay % 2 && g_GameFlags & 1) @@ -586,11 +594,13 @@ int ModeAction() if (swPlay % 2) { - int tscRet = TextScriptProc(); - if (tscRet == 0) - return 0; - if (tscRet == 2) - return 1; + switch (TextScriptProc()) + { + case 0: + return 0; + case 2: + return 1; + } } PutMapName(FALSE);