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

fix

Browse source
This commit is contained in:
cuckydev 2019-02-13 19:46:45 -05:00
parent cd9df8ec47
commit e1cd4cf8d8
3 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ArmsItem.cpp
View file

@ -363,21 +363,25 @@ int CampLoop()
if (gKeyTrg & KEY_ESCAPE) if (gKeyTrg & KEY_ESCAPE)
{ {
int escRet = Call_Escape(); switch (Call_Escape())
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 1; return 2;
}
} }
if (g_GameFlags & 2) if (g_GameFlags & 2)
MoveCampCursor(); MoveCampCursor();
int tscRet = TextScriptProc(); switch (TextScriptProc())
if (tscRet == 0) {
case 0:
return 0; return 0;
if (tscRet == 2) case 2:
return 2; return 2;
}
PutBitmap4(&rcView, 0, 0, &rcView, 10); PutBitmap4(&rcView, 0, 0, &rcView, 10);
PutCampObject(); PutCampObject();

16
src/Game.cpp
View file

@ -532,11 +532,13 @@ int ModeAction()
{ {
BackupSurface(10, &grcGame); BackupSurface(10, &grcGame);
int campRet = CampLoop(); switch (CampLoop())
if (campRet == 0) {
case 0:
return 0; return 0;
if (campRet == 2) case 2:
return 1; return 1;
}
gMC.cond &= ~1; gMC.cond &= ~1;
} }
@ -544,13 +546,15 @@ int ModeAction()
{ {
BackupSurface(10, &grcGame); BackupSurface(10, &grcGame);
int miniRet = MiniMapLoop(); switch (MiniMapLoop())
if (miniRet == 0) {
case 0:
return 0; return 0;
if (miniRet == 2) case 2:
return 1; return 1;
} }
} }
}
if (g_GameFlags & 2) if (g_GameFlags & 2)
{ {

24
src/MiniMap.cpp
View file

@ -91,12 +91,14 @@ int MiniMapLoop()
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(); switch (Call_Escape())
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 2; return 2;
} }
}
PutBitmap4(&grcGame, 0, 0, &grcGame, 10); PutBitmap4(&grcGame, 0, 0, &grcGame, 10);
@ -125,12 +127,14 @@ int MiniMapLoop()
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(); switch (Call_Escape())
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 2; return 2;
} }
}
PutBitmap4(&grcGame, 0, 0, &grcGame, 10); PutBitmap4(&grcGame, 0, 0, &grcGame, 10);
CortBox(&rcView, 0); CortBox(&rcView, 0);
@ -157,12 +161,14 @@ int MiniMapLoop()
if (gKey & KEY_ESCAPE) if (gKey & KEY_ESCAPE)
{ {
int escRet = Call_Escape(); switch (Call_Escape())
if (escRet == 0) {
case 0:
return 0; return 0;
if (escRet == 2) case 2:
return 2; return 2;
} }
}
PutBitmap4(&grcGame, 0, 0, &grcGame, 10); PutBitmap4(&grcGame, 0, 0, &grcGame, 10);
rcView = {(WINDOW_WIDTH / 2) - f * gMap.width / 16, (WINDOW_HEIGHT / 2) - f * gMap.length / 16, (WINDOW_WIDTH / 2) + f * gMap.width / 16, (WINDOW_HEIGHT / 2) + f * gMap.length / 16}; rcView = {(WINDOW_WIDTH / 2) - f * gMap.width / 16, (WINDOW_HEIGHT / 2) - f * gMap.length / 16, (WINDOW_WIDTH / 2) + f * gMap.width / 16, (WINDOW_HEIGHT / 2) + f * gMap.length / 16};