From c895f45d96caa1d160beda900047d2df1b2d9738 Mon Sep 17 00:00:00 2001 From: toaster Date: Wed, 15 Aug 2018 15:22:50 +0100 Subject: [PATCH] Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen). I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well --- src/m_menu.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index a3ebdc7d..eb8123e9 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -929,12 +929,13 @@ static menuitem_t MP_MainMenu[] = static menuitem_t MP_ServerMenu[] = { - {IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 10}, + {IT_STRING|IT_CVAR, NULL, "Max. Player Count", &cv_maxplayers, 10}, #ifndef NONET {IT_STRING|IT_CALL, NULL, "Room...", M_RoomMenu, 20}, {IT_STRING|IT_CVAR|IT_CV_STRING, NULL, "Server Name", &cv_servername, 30}, #endif + {IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 68}, {IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78}, {IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130}, @@ -943,19 +944,20 @@ static menuitem_t MP_ServerMenu[] = // Separated splitscreen and normal servers. static menuitem_t MP_SplitServerMenu[] = { - {IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 10}, #ifndef NOFOURPLAYER - {IT_STRING|IT_CVAR, NULL, "Number of players", &cv_dummysplitplayers, 20}, + {IT_STRING|IT_CVAR, NULL, "Number of players", &cv_dummysplitplayers, 10}, #endif + + {IT_STRING|IT_CVAR, NULL, "Game Type", &cv_newgametype, 68}, {IT_STRING|IT_CVAR, NULL, "Level", &cv_nextmap, 78}, #ifdef NOFOURPLAYER - {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 108}, - {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 118}, + {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 110}, + {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 120}, #else - {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 88}, - {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 98}, - {IT_GRAYEDOUT, NULL, "P3 Setup...", M_SetupMultiPlayer3, 108}, - {IT_GRAYEDOUT, NULL, "P4 Setup... ", M_SetupMultiPlayer4, 118}, + {IT_STRING|IT_CALL, NULL, "P1 Setup...", M_SetupMultiPlayer, 90}, + {IT_STRING|IT_CALL, NULL, "P2 Setup... ", M_SetupMultiPlayer2, 100}, + {IT_GRAYEDOUT, NULL, "P3 Setup...", M_SetupMultiPlayer3, 110}, + {IT_GRAYEDOUT, NULL, "P4 Setup... ", M_SetupMultiPlayer4, 120}, #endif {IT_WHITESTRING|IT_CALL, NULL, "Start", M_StartServer, 130}, }; @@ -1474,7 +1476,7 @@ static menuitem_t OP_ServerOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Voting Timer", &cv_votetime, 60}, #ifndef NONET - {IT_STRING | IT_CVAR, NULL, "Max Player Count", &cv_maxplayers, 80}, + {IT_STRING | IT_CVAR, NULL, "Max. Player Count", &cv_maxplayers, 80}, {IT_STRING | IT_CVAR, NULL, "Allow Players to Join", &cv_allownewplayer, 90}, //{IT_STRING | IT_CVAR, NULL, "Join on Map Change", &cv_joinnextround, 100}, @@ -6872,7 +6874,7 @@ static void M_DrawServerMenu(void) 3* #endif incrwidth; - INT32 x = BASEVIDWIDTH/2 - paw/2, y = currentMenu->y + 32, trans = 0; + INT32 x = BASEVIDWIDTH/2 - paw/2, y = currentMenu->y + 27, trans = 0; patch_t *face; while (++i <=