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

More cleanup

Browse source
This commit is contained in:
Clownacy 2020-09-27 22:02:45 +01:00
parent 97a042dcc0
commit 0730bb74ef
3 changed files with 39 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/MiniMap.cpp
View file

@ -34,39 +34,39 @@ void WriteMiniMapLine(int line)
// No switch here.
if (a == 0)
Surface2Surface(x, line, &rcLevel[0], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
else if (a == 68 ||
a == 1 ||
a == 64 ||
a == 128 ||
a == 129 ||
a == 130 ||
a == 131 ||
a == 81 ||
a == 82 ||
a == 85 ||
a == 86 ||
a == 2 ||
a == 96 ||
a == 113 ||
a == 114 ||
a == 117 ||
a == 118 ||
a == 160 ||
a == 161 ||
a == 162 ||
a == 163)
else if (a == 68 ||
a == 1 ||
a == 64 ||
a == 128 ||
a == 129 ||
a == 130 ||
a == 131 ||
a == 81 ||
a == 82 ||
a == 85 ||
a == 86 ||
a == 2 ||
a == 96 ||
a == 113 ||
a == 114 ||
a == 117 ||
a == 118 ||
a == 160 ||
a == 161 ||
a == 162 ||
a == 163)
Surface2Surface(x, line, &rcLevel[1], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
else if (a == 67 ||
a == 99 ||
a == 80 ||
a == 83 ||
a == 84 ||
a == 87 ||
a == 96 || // This is already listed above, so that part of the expression is always false
a == 112 ||
a == 115 ||
a == 116 ||
a == 119)
else if (a == 67 ||
a == 99 ||
a == 80 ||
a == 83 ||
a == 84 ||
a == 87 ||
a == 96 || // This is already listed above, so this part of the expression is always false
a == 112 ||
a == 115 ||
a == 116 ||
a == 119)
Surface2Surface(x, line, &rcLevel[2], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
else
Surface2Surface(x, line, &rcLevel[3], SURFACE_ID_MAP, SURFACE_ID_TEXT_BOX);
@ -123,8 +123,10 @@ int MiniMapLoop(void)
rcMiniMap.top = 0;
rcMiniMap.bottom = gMap.length;
rcView.right = --rcView.left + gMap.width + 2;
rcView.bottom = --rcView.top + gMap.length + 2;
rcView.left -= 1;
rcView.right = rcView.left + gMap.width + 2;
rcView.top -= 1;
rcView.bottom = rcView.top + gMap.length + 2;
CortBox2(&rcMiniMap, 0, SURFACE_ID_MAP);
line = 0;

2
src/MycParam.cpp
View file

@ -173,7 +173,7 @@ void DamageMyChar(int damage)
{
PlaySoundObject(17, SOUND_MODE_PLAY);
gMC.cond = 0;
SetDestroyNpChar(gMC.x, gMC.y, 0x1400, 0x40);
SetDestroyNpChar(gMC.x, gMC.y, 10 * 0x200, 0x40);
StartTextScript(40);
}
}

3
src/SelStage.cpp
View file

@ -211,7 +211,8 @@ int StageSelectLoop(int *p_event)
StopTextScript();
break;
}
else if (gKeyTrg & gKeyCancel)
if (gKeyTrg & gKeyCancel)
{
StopTextScript();
LoadTextScript_Stage(old_script_path);