From b8b183a687506c4491f2f6438fd407ba47932ada Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 10 Nov 2022 20:56:50 +1000 Subject: [PATCH] Remove code references to STAGE_TEST_OLD --- src/game/bg.c | 1 - src/game/game_1531a0.c | 4 --- src/game/lv.c | 61 +----------------------------------------- src/game/player.c | 5 ---- src/game/stars.c | 5 +--- src/lib/main.c | 10 +++---- src/lib/vi.c | 2 +- 7 files changed, 7 insertions(+), 81 deletions(-) diff --git a/src/game/bg.c b/src/game/bg.c index de5fde160..1f2eb2ffe 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -1485,7 +1485,6 @@ Gfx *bgRenderScene(Gfx *gdl) if (PLAYERCOUNT() == 1 && (stagenum == STAGE_DEFECTION || stagenum == STAGE_EXTRACTION - || stagenum == STAGE_TEST_OLD || stagenum == STAGE_INFILTRATION || stagenum == STAGE_ESCAPE || stagenum == STAGE_ATTACKSHIP)) { diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index fb7c3e89f..ca6bdbc66 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -585,10 +585,6 @@ void textReset(void) #else textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); #endif - - if (g_Vars.stagenum == STAGE_TEST_OLD) { - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); - } } } #endif diff --git a/src/game/lv.c b/src/game/lv.c index cd81faf37..7e9dab5f2 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -305,10 +305,6 @@ void lvReset(s32 stagenum) textReset(); hudmsgsReset(); - if (stagenum == STAGE_TEST_OLD) { - titleReset(); - } - if (stagenum == STAGE_TITLE) { titleReset(); } else if (stagenum == STAGE_BOOTPAKMENU) { @@ -390,7 +386,6 @@ void lvReset(s32 stagenum) case STAGE_INFILTRATION: case STAGE_DEFECTION: case STAGE_ATTACKSHIP: - case STAGE_TEST_OLD: starsReset(); break; } @@ -511,10 +506,6 @@ Gfx *lvRenderFade(Gfx *gdl) u32 colour = g_FadeColour; u32 inset = 0; - if (g_Vars.stagenum == STAGE_TEST_OLD) { - inset = 61; - } - if (g_FadeFrac >= 0) { if (g_FadeDelay > 0) { g_FadeDelay--; @@ -1146,8 +1137,7 @@ Gfx *lvRender(Gfx *gdl) func0f0d5a7c(); #endif - if (g_Vars.stagenum == STAGE_TITLE - || (g_Vars.stagenum == STAGE_TEST_OLD && titleIsKeepingMode())) { + if (g_Vars.stagenum == STAGE_TITLE) { gSPDisplayList(gdl++, &var800613a0); if (debugIsZBufferDisabled()) { @@ -1500,50 +1490,6 @@ Gfx *lvRender(Gfx *gdl) u32 alpha; if (g_Vars.tickmode == TICKMODE_CUTSCENE) { - // This chunk of code is unreachable - // (STAGE_TEST_OLD is not used) -#if VERSION < VERSION_PAL_BETA - if (g_Vars.stagenum == STAGE_TEST_OLD) { - f32 frac = 0; - u32 colour; - s32 endframe = animGetNumFrames(g_CutsceneAnimNum) - 1; - - colour = 0; - - if (g_CutsceneCurAnimFrame60 < 90) { - frac = 1.0f - (f32)g_CutsceneCurAnimFrame60 / 90.0f; - } - - if (g_CutsceneAnimNum != ANIM_CUT_OLD_TITLE_CAM_04) { - if (g_CutsceneCurAnimFrame60 > endframe - 90) { - frac = (g_CutsceneCurAnimFrame60 - endframe + 90) / 90.0f; - } - } else { - if (g_CutsceneCurAnimFrame60 > endframe - 30) { - colour = 0xffffff00; - frac = (g_CutsceneCurAnimFrame60 - endframe + 30) / 30.0f; - } - } - - if (frac > 0) { - alpha = 255 * frac; - - gDPPipeSync(gdl++); - gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2); - gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - gDPSetPrimColorViaWord(gdl++, 0, 0, colour | alpha); - - gDPFillRectangle(gdl++, - viGetViewLeft(), - viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), - viGetViewTop() + viGetViewHeight()); - - gdl = text0f153838(gdl); - } - } -#endif - // Handle visual effects in cutscenes switch (g_CutsceneAnimNum) { case ANIM_CUT_CAVE_INTRO_CAM: @@ -2404,11 +2350,6 @@ void lvTick(void) viSetUseZBuf(true); - if (g_Vars.stagenum == STAGE_TEST_OLD) { - titleTickOld(); - musicTick(); - } - if (g_Vars.stagenum == STAGE_TITLE) { titleTick(); langTick(); diff --git a/src/game/player.c b/src/game/player.c index 591db6446..cb641f575 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -3483,11 +3483,6 @@ void playerTick(bool arg0) playerTickTeleport(&aspectratio); } - if (g_Vars.stagenum == STAGE_TEST_OLD && func0f01ad5c()) { - func0f01adb8(); - return; - } - playermgrSetFovY(60); playermgrSetAspectRatio(aspectratio); playermgrSetViewSize(playerGetViewportWidth(), playerGetViewportHeight()); diff --git a/src/game/stars.c b/src/game/stars.c index 3f15c28a5..b81b414bf 100644 --- a/src/game/stars.c +++ b/src/game/stars.c @@ -117,10 +117,7 @@ void starsReset(void) g_StarsBelowHorizon = false; g_StarGridSize = 3; - if (g_Vars.stagenum == STAGE_TEST_OLD) { - g_StarsBelowHorizon = true; - g_StarCount = 1600; - } else if (g_Vars.stagenum == STAGE_DEFECTION || g_Vars.stagenum == STAGE_EXTRACTION) { + if (g_Vars.stagenum == STAGE_DEFECTION || g_Vars.stagenum == STAGE_EXTRACTION) { g_StarCount = 200; g_StarGridSize = 2; } else if (g_Vars.stagenum == STAGE_ATTACKSHIP) { diff --git a/src/lib/main.c b/src/lib/main.c index e2940092f..53cd50189 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -1741,12 +1741,10 @@ void mainTick(void) for (i = 0; i < PLAYERCOUNT(); i++) { setCurrentPlayerNum(playermgrGetPlayerAtOrder(i)); - if (g_StageNum != STAGE_TEST_OLD || !titleIsKeepingMode()) { - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize( - g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, - g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); - } + viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + viSetFovAspectAndSize( + g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); lvTickPlayer(); } diff --git a/src/lib/vi.c b/src/lib/vi.c index c43f651bf..7fdc87a99 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -188,7 +188,7 @@ void viReset(s32 stagenum) g_Vars.fourmeg2player = false; - if (stagenum == STAGE_TITLE || stagenum == STAGE_TEST_OLD) { + if (stagenum == STAGE_TITLE) { if (IS4MB()) { viSetMode(VIMODE_HI); fbsize = 640 * 440 * 2;