diff --git a/src/game/bg.c b/src/game/bg.c index e9a30b048..7f78c4e62 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -928,15 +928,11 @@ Gfx *bgRenderSceneInXray(Gfx *gdl) gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - if (getVar80084040()) { - if (thing->roomnum == -1) { - gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); - } - - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); + if (thing->roomnum == -1) { + gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); } - if (1); + gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); } } } @@ -1105,24 +1101,20 @@ Gfx *bgRenderScene(Gfx *gdl) gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gdl = envStopFog(gdl); - if (getVar80084040()) { - if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_OPA_PREBG, roomnumsbyprop); - } - - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_PREBG, roomnumsbyprop); + if (firstroomnum == thing->roomnum) { + gdl = propsRender(gdl, 0, RENDERPASS_OPA_PREBG, roomnumsbyprop); } + gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_PREBG, roomnumsbyprop); + // Render BG opaque components gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gdl = currentPlayerScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); gdl = envStartFog(gdl, false); - if (getVar80084040()) { - if (g_StageIndex != STAGEINDEX_TEST_OLD) { - gdl = bgRenderRoomOpaque(gdl, thing->roomnum); - } + if (g_StageIndex != STAGEINDEX_TEST_OLD) { + gdl = bgRenderRoomOpaque(gdl, thing->roomnum); } // Render prop opaque components - post BG pass @@ -1130,13 +1122,11 @@ Gfx *bgRenderScene(Gfx *gdl) gdl = envStopFog(gdl); - if (getVar80084040()) { - if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_OPA_POSTBG, roomnumsbyprop); - } - - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_POSTBG, roomnumsbyprop); + if (firstroomnum == thing->roomnum) { + gdl = propsRender(gdl, 0, RENDERPASS_OPA_POSTBG, roomnumsbyprop); } + + gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_POSTBG, roomnumsbyprop); } gdl = envStopFog(gdl); @@ -1145,7 +1135,7 @@ Gfx *bgRenderScene(Gfx *gdl) // Render wall hits gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - if (getVar80084040() && g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { + if (g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { for (i = 0; i < var8007fc2c; i++) { roomnum = roomnums[i]; gdl = wallhitRenderBgHits(var800a4640.unk000[roomnum].roomnum, gdl); @@ -1167,23 +1157,19 @@ Gfx *bgRenderScene(Gfx *gdl) gdl = currentPlayerScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); gdl = envStartFog(gdl, true); - if (getVar80084040()) { - gdl = bgRenderRoomXlu(gdl, thing->roomnum); - } + gdl = bgRenderRoomXlu(gdl, thing->roomnum); gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gdl = envStopFog(gdl); // Render prop translucent components - if (getVar80084040()) { - if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); - } - - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); + if (firstroomnum == thing->roomnum) { + gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); } + gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); + if (!g_Vars.mplayerisrunning) { artifactsCalculateGlaresForRoom(thing->roomnum); diff --git a/src/game/lv.c b/src/game/lv.c index c9c54d445..ee8a535ca 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -116,7 +116,6 @@ s32 g_MpTeamScoreLimit = 20; struct sndstate *g_MiscAudioHandle = NULL; s32 g_NumReasonsToEndMpMatch = 0; f32 g_StageTimeElapsed1f = 0; -bool var80084040 = true; u32 g_MiscSfxSounds[] = { SFX_HEARTBEAT, @@ -134,11 +133,6 @@ s16 g_FadeDelay = 0; void lvResetSoloHandicaps(void); -u32 getVar80084040(void) -{ - return var80084040; -} - void lvInit(void) { g_Vars.lockscreen = 0; @@ -240,7 +234,6 @@ void lvReset(s32 stagenum) cheatsReset(); - var80084040 = true; g_Vars.lvframenum = 0; var80084050 = 0; diff --git a/src/include/game/lv.h b/src/include/game/lv.h index bc14d4356..74b57903d 100644 --- a/src/include/game/lv.h +++ b/src/include/game/lv.h @@ -4,7 +4,6 @@ #include "data.h" #include "types.h" -u32 getVar80084040(void); void lvInit(void); void lvResetMiscSfx(void); s32 lvGetMiscSfxIndex(u32 arg0);