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

Stage.cpp cleanup

Browse source
This commit is contained in:
Clownacy 2019-11-14 00:23:50 +00:00
parent e4ff51dc83
commit 156e47438c
3 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Stage.cpp
View file

@ -130,17 +130,19 @@ const STAGE_TABLE gTMT[95] = {
BOOL TransferStage(int no, int w, int x, int y) BOOL TransferStage(int no, int w, int x, int y)
{ {
BOOL bError;
char path_dir[20];
char path[MAX_PATH];
// Move character // Move character
SetMyCharPosition(x * 0x10 * 0x200, y * 0x10 * 0x200); SetMyCharPosition(x * 0x10 * 0x200, y * 0x10 * 0x200);
BOOL bError = FALSE; bError = FALSE;
// Get path // Get path
char path_dir[20];
strcpy(path_dir, "Stage"); strcpy(path_dir, "Stage");
// Load tileset // Load tileset
char path[MAX_PATH];
sprintf(path, "%s\\Prt%s", path_dir, gTMT[no].parts); sprintf(path, "%s\\Prt%s", path_dir, gTMT[no].parts);
if (!ReloadBitmap_File(path, SURFACE_ID_LEVEL_TILESET)) if (!ReloadBitmap_File(path, SURFACE_ID_LEVEL_TILESET))
bError = TRUE; bError = TRUE;
@ -196,12 +198,12 @@ BOOL TransferStage(int no, int w, int x, int y)
InitBossChar(gTMT[no].boss_no); InitBossChar(gTMT[no].boss_no);
ResetFlash(); ResetFlash();
gStageNo = no; gStageNo = no;
return TRUE; return TRUE;
} }
// Music // Music
const char *gMusicTable[42] = const char *gMusicTable[42] = {
{
"XXXX", "XXXX",
"WANPAKU", "WANPAKU",
"ANZEN", "ANZEN",
@ -226,7 +228,7 @@ const char *gMusicTable[42] =
"ACCESS", "ACCESS",
"IRONH", "IRONH",
"GRAND", "GRAND",
"Curly", // Uses the original filename instead of the internal 8.3 one "Curly", // Uses the original filename instead of the internal allcaps one
"OSIDE", "OSIDE",
"REQUIEM", "REQUIEM",
"WANPAK2", "WANPAK2",
@ -270,7 +272,7 @@ void ChangeMusic(MusicID no)
gMusicNo = no; gMusicNo = no;
} }
void ReCallMusic() void ReCallMusic(void)
{ {
// Stop old song // Stop old song
StopOrganyaMusic(); StopOrganyaMusic();

2
src/Stage.h
View file

@ -65,4 +65,4 @@ extern MusicID gMusicNo;
BOOL TransferStage(int no, int w, int x, int y); BOOL TransferStage(int no, int w, int x, int y);
void ChangeMusic(MusicID no); void ChangeMusic(MusicID no);
void ReCallMusic(); void ReCallMusic(void);

4
src/Star.h
View file

@ -1,5 +1,5 @@
#pragma once #pragma once
void InitStar(); void InitStar(void);
void ActStar(); void ActStar(void);
void PutStar(int fx, int fy); void PutStar(int fx, int fy);