duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct some misdecompiled switchcases

Browse source
This commit is contained in:
Clownacy 2019-06-21 11:02:20 +00:00
parent 31196e15ec
commit 19166f80d0
1 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Game.cpp
View file

@ -140,12 +140,14 @@ int ModeOpening()
// Escape menu // Escape menu
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(ghWnd); switch (Call_Escape(ghWnd))
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 1; return 1;
} }
}
// Skip intro if OK is pressed // Skip intro if OK is pressed
if (gKey & gKeyOk) if (gKey & gKeyOk)
@ -182,11 +184,13 @@ int ModeOpening()
PutFade(); PutFade();
// Update Text Script // Update Text Script
int tscRet = TextScriptProc(); switch (TextScriptProc())
if (tscRet == 0) {
case 0:
return 0; return 0;
if (tscRet == 2) case 2:
return 1; return 1;
}
PutMapName(FALSE); PutMapName(FALSE);
PutTextScript(); PutTextScript();
@ -334,12 +338,14 @@ int ModeTitle()
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(ghWnd); switch (Call_Escape(ghWnd))
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 1; return 1;
} }
}
// Move cursor // Move cursor
if ((gKeyDown | gKeyUp) & gKeyTrg) if ((gKeyDown | gKeyUp) & gKeyTrg)
@ -478,12 +484,14 @@ int ModeAction()
// Escape menu // Escape menu
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(ghWnd); switch (Call_Escape(ghWnd))
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 1; return 1;
} }
}
if (swPlay % 2 && g_GameFlags & 1) if (swPlay % 2 && g_GameFlags & 1)
{ {
@ -586,12 +594,14 @@ int ModeAction()
if (swPlay % 2) if (swPlay % 2)
{ {
int tscRet = TextScriptProc(); switch (TextScriptProc())
if (tscRet == 0) {
case 0:
return 0; return 0;
if (tscRet == 2) case 2:
return 1; return 1;
} }
}
PutMapName(FALSE); PutMapName(FALSE);
PutTimeCounter(16, 8); PutTimeCounter(16, 8);