Merge remote-tracking branch 'origin/lugstuff' into lugstuff
This commit is contained in:
commit
7fe054818f
2 files changed
+3
-24
No files matched your search
+3
-19
@@ -959,24 +959,6 @@ void D_SRB2Loop(void)
|
||||
// D_SRB2Main
|
||||
// =========================================================================
|
||||
|
||||
static void ResetSplitScreen(void)
|
||||
{
|
||||
UINT8 i;
|
||||
|
||||
// recompute screen size
|
||||
R_ExecuteSetViewSize();
|
||||
|
||||
if (!demo.playback && !botingame)
|
||||
{
|
||||
for (i = 1; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
{
|
||||
if (i > splitscreen)
|
||||
CL_RemoveSplitscreenPlayer(displayplayers[i]);
|
||||
else
|
||||
CL_AddSplitscreenPlayer();
|
||||
}
|
||||
}
|
||||
}
|
||||
//
|
||||
// D_ClearState
|
||||
//
|
||||
@@ -997,7 +979,9 @@ void D_ClearState(void)
|
||||
CL_ClearPlayer(i);
|
||||
|
||||
splitscreen = 0;
|
||||
ResetSplitScreen(); // splitscreen onchange resets us to singleplayer :chaosleep:
|
||||
|
||||
// recompute screen size
|
||||
R_ExecuteSetViewSize();
|
||||
|
||||
botingame = false;
|
||||
botskin = 0;
|
||||
|
||||
@@ -3494,11 +3494,6 @@ void G_StopDemo(void)
|
||||
demo.rewinding = false;
|
||||
CL_ClearRewinds();
|
||||
|
||||
if (gamestate == GS_INTERMISSION)
|
||||
Y_EndIntermission(); // cleanup
|
||||
if (gamestate == GS_VOTING)
|
||||
Y_EndVote();
|
||||
|
||||
D_ClearState();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user