diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 942823b8c..2455d905c 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -585,7 +585,8 @@ static CV_PossibleValue_t skinselectgridsort_t[] ={ }; consvar_t cv_skinselectgridsort ={ "skinselectgridsort", "Real name", CV_SAVE|CV_CALL|CV_NOINIT, skinselectgridsort_t, sortSkinGrid, 0, NULL, NULL, 0, 0, NULL }; -consvar_t cv_betainterscreen = {"betaintermissionscreen", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t betainterscreen_t[] = {{0, "Off"}, {1, "On"}, {2, "NoBG"}, {0, NULL}}; +consvar_t cv_betainterscreen = {"betaintermissionscreen", "Off", CV_SAVE, betainterscreen_t, NULL, 0, NULL, NULL, 0, 0, NULL}; INT16 gametype = GT_RACE; // SRB2kart boolean forceresetplayers = false; diff --git a/src/m_menu.c b/src/m_menu.c index c4606345e..8cd0ac2d8 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2260,12 +2260,14 @@ static menuitem_t OP_SaturnHudMenu[] = {IT_STRING | IT_CVAR, NULL, "Show Director Prompt", &cv_showdirectorhud, 80}, - {IT_STRING | IT_CVAR, NULL, "Uncapped HUD", &cv_uncappedhud, 90}, + {IT_STRING | IT_CVAR, NULL, "Beta Intermissionscreen", &cv_betainterscreen, 90}, - {IT_STRING | IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 100}, - {IT_STRING | IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 105}, + {IT_STRING | IT_CVAR, NULL, "Uncapped HUD", &cv_uncappedhud, 100}, - {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 115}, + {IT_STRING | IT_SUBMENU, NULL, "Nametags...", &OP_NametagDef, 110}, + {IT_STRING | IT_SUBMENU, NULL, "Driftgauge...", &OP_DriftGaugeDef, 115}, + + {IT_SUBMENU|IT_STRING, NULL, "Hud Offsets...", &OP_HudOffsetDef, 125}, }; static const char* OP_SaturnHudTooltips[] = @@ -2285,6 +2287,7 @@ static const char* OP_SaturnHudTooltips[] = "Show player names on the minimap.", "Minimize the player icons on the minimap.", "Show the Director Toggle prompt when spectating.", + "Make the Intermission screen look like in beta versions of Kart!\nEither with background or just the rest.", "Uncaps the HUD framerate, making it appear smoother.", "Nametag Options.", "Driftgauge Options.", @@ -2308,6 +2311,7 @@ enum sh_mapname, sh_smallmap, sh_directorhud, + sh_betainter, sh_uncappedhud, sh_nametagmen, sh_driftgaugemen, diff --git a/src/y_inter.c b/src/y_inter.c index 758abafac..bf6dfe359 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -9,6 +9,7 @@ /// \file y_inter.c /// \brief Tally screens, or "Intermissions" as they were formally called in Doom +#include "d_netcmd.h" #include "doomdef.h" #include "doomstat.h" #include "d_main.h" @@ -365,7 +366,7 @@ void Y_IntermissionDrawer(void) if (intertype == int_none || rendermode == render_none) return; - if (cv_betainterscreen.value + if (cv_betainterscreen.value == 1 #ifdef HWRENDER || (rendermode == render_opengl && cv_grscreentextures.value != 2) // use the neato kart bg for intermission on disabled screen textures #endif @@ -409,7 +410,7 @@ void Y_IntermissionDrawer(void) { #define NUMFORNEWCOLUMN 8 INT32 y = 41, gutter = ((data.match.numplayers > NUMFORNEWCOLUMN) ? 0 : (BASEVIDWIDTH/2)); - INT32 dupadjust = (vid.width/vid.dupx), duptweak = (dupadjust - BASEVIDWIDTH)/2; + INT32 dupadjust = cv_betainterscreen.value ? 314 : (vid.width/vid.dupx), duptweak = cv_betainterscreen.value ? -3 : (dupadjust - BASEVIDWIDTH)/2; const char *timeheader; if (data.match.rankingsmode)