mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-09-02 17:52:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove code references to STAGE_TEST_OLD

Browse Source
This commit is contained in:
Ryan Dwyer
2022-11-10 20:56:50 +10:00
parent 4fc36d7d3f
commit b8b183a687
7 changed files with 7 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bg.c
-1
View File
@@ -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)) {
src/game/game_1531a0.c
-4
View File
@@ -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
src/game/lv.c
+1 -60
View File
@@ -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();
src/game/player.c
-5
View File
@@ -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());
src/game/stars.c
+1 -4
View File
@@ -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) {
src/lib/main.c
+4 -6
View File
@@ -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();
}
src/lib/vi.c
+1 -1
View File
@@ -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;