diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index a2e3c7c00..cd520482d 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -582,9 +582,6 @@ Gfx *scenarioRenderHud(Gfx *gdl) // Player on bottom quarter - draw line at top of viewport gDPFillRectangle(gdl++, viewleft, viewtop, viewright - 1, viewtop); } - } else if (g_Vars.fourmeg2player) { - // Draw line at bottom of viewport - gDPFillRectangle(gdl++, viewleft, viewheight + viewtop - 2, viewright - 1, viewheight + viewtop - 2); } else { // @bug: No consideration is made for vertical splits here, // however when using a vertical split neither line is visible. diff --git a/src/game/player.c b/src/game/player.c index 7e707a424..52c693f64 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -2635,10 +2635,6 @@ s16 playerGetFbHeight(void) { s16 height = g_ViModes[g_ViRes].fbheight; - if (g_Vars.fourmeg2player) { - height = height >> 1; - } - return height; } @@ -2666,7 +2662,7 @@ s16 playerGetViewportWidth(void) width--; } } else if (PLAYERCOUNT() == 2) { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { + if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { // 2 players vsplit width = g_ViModes[g_ViRes].width / 2; @@ -2703,7 +2699,7 @@ s16 playerGetViewportLeft(void) left = g_ViModes[g_ViRes].fbwidth - g_ViModes[g_ViRes].width; } } else if (PLAYERCOUNT() == 2 && something != 0) { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { + if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (g_Vars.currentplayernum == 1) { // 2 players vsplit - right side left = (g_ViModes[g_ViRes].width / 2) + g_ViModes[g_ViRes].fbwidth - g_ViModes[g_ViRes].width; @@ -2774,8 +2770,7 @@ s16 playerGetViewportTop(void) if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL || PLAYERCOUNT() != 2) { if (PLAYERCOUNT() == 2 && g_Vars.currentplayernum == 1 - && optionsGetScreenSplit() != SCREENSPLIT_VERTICAL - && !g_Vars.fourmeg2player) { + && optionsGetScreenSplit() != SCREENSPLIT_VERTICAL) { // 2 players hsplit - bottom side top = g_ViModes[g_ViRes].fulltop + g_ViModes[g_ViRes].fullheight / 2; } else if (g_Vars.currentplayernum == 2 || g_Vars.currentplayernum == 3) { diff --git a/src/game/playermgr.c b/src/game/playermgr.c index 19f2a5c4b..da6d55072 100644 --- a/src/game/playermgr.c +++ b/src/game/playermgr.c @@ -74,11 +74,7 @@ void playermgrAllocatePlayers(s32 count) playermgrAllocatePlayer(0); setCurrentPlayerNum(0); - if (g_Vars.fourmeg2player) { - playermgrSetViewSize(playerGetFbWidth(), playerGetFbHeight() * 2); - } else { - playermgrSetViewSize(playerGetFbWidth(), playerGetFbHeight()); - } + playermgrSetViewSize(playerGetFbWidth(), playerGetFbHeight()); g_Vars.coop = NULL; g_Vars.anti = NULL; diff --git a/src/lib/varsinit.c b/src/lib/varsinit.c index 0fccf5c5a..19d61a523 100644 --- a/src/lib/varsinit.c +++ b/src/lib/varsinit.c @@ -72,6 +72,5 @@ void varsInit(void) g_Vars.autocutgroupcur = -1; g_Vars.autocutgroupleft = 0; g_Vars.autocutgroupskip = false; - g_Vars.fourmeg2player = false; g_Vars.cutsceneskip60ths = 0; } diff --git a/src/lib/vi.c b/src/lib/vi.c index baf88883c..ae2554163 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -103,7 +103,6 @@ void viConfigureForCopyright(u16 *texturedata) g_ViBackData->fb = g_FrameBuffers[g_ViBackIndex]; g_ViReconfigured = true; - g_Vars.fourmeg2player = false; } /** @@ -126,8 +125,6 @@ void viConfigureForLegal(void) g_ViDataArray[i].viewy = 220; } - g_Vars.fourmeg2player = false; - #if PAL playerResetLoResIf4Mb(); #endif @@ -159,8 +156,6 @@ void viReset(s32 stagenum) u8 *fb0; u8 *fb1; - g_Vars.fourmeg2player = false; - if (stagenum == STAGE_TITLE) { viSetMode(VIMODE_HI); fbsize = g_ViModeWidths[2] * g_ViModeHeights[2] * 2; @@ -657,7 +652,7 @@ Gfx *viRenderViewportEdges(Gfx *gdl) gDPPipeSync(gdl++); if (PLAYERCOUNT() >= 3 || - (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player))) { + (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL)) { if (PLAYERCOUNT() == 2) { tmpplayernum = 0; }