diff --git a/src/d_netcmd.c b/src/d_netcmd.c index c9a030ab8..d7e3a5149 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4364,7 +4364,11 @@ static void Command_Version_f(void) #endif // DEVELOP build -#ifdef DEVELOP +#if defined(TESTERS) + CONS_Printf("\x88" "TESTERS " "\x80"); +#elif defined(HOSTTESTERS) + CONS_Printf("\x82" "HOSTTESTERS " "\x80"); +#elif defined(DEVELOP) CONS_Printf("\x87" "DEVELOP " "\x80"); #endif diff --git a/src/f_finale.c b/src/f_finale.c index c6596e378..52f2556f4 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1998,6 +1998,38 @@ void F_TitleScreenDrawer(void) V_DrawFixedPatch(0, 0, FRACUNIT, 0, kts_bumper, NULL); V_DrawFixedPatch(0, 0, FRACUNIT, 0, kts_copyright, NULL); + + // An adapted thing from old menus - most games have version info on the title screen now... + { + INT32 texty = vid.height - 10*vid.dupy; +#define addtext(f, str) {\ + V_DrawThinString(vid.dupx, texty, V_NOSCALESTART|f, str);\ + texty -= 10*vid.dupy;\ +} + if (customversionstring[0] != '\0') + { + addtext(V_ALLOWLOWERCASE, customversionstring); + addtext(0, "Mod version:"); + } + else + { +// Development -- show revision / branch info +#if defined(TESTERS) + addtext(V_ALLOWLOWERCASE|V_SKYMAP, "Tester client"); + addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate)); +#elif defined(HOSTTESTERS) + addtext(V_ALLOWLOWERCASE|V_REDMAP, "Netgame host for testers"); + addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", compdate)); +#elif defined(DEVELOP) + addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, comprevision); + addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, compbranch); +#else // Regular build + addtext(V_ALLOWLOWERCASE|V_TRANSLUCENT, va("%s", VERSIONSTRING)); +#endif + } +#undef addtext + } + break; } diff --git a/src/m_menu.c b/src/m_menu.c index 8255e5f35..9a446f8c3 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3119,26 +3119,6 @@ void M_Drawer(void) M_GetGametypeColor(); currentMenu->drawroutine(); // call current menu Draw routine } - - // Draw version down in corner - // ... but only in the MAIN MENU. I'm a picky bastard. - if (currentMenu == &MainDef) - { - if (customversionstring[0] != '\0') - { - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT, "Mod version:"); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, customversionstring); - } - else - { -#ifdef DEVELOP // Development -- show revision / branch info - V_DrawThinString(vid.dupx, vid.height - 20*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, compbranch); - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, comprevision); -#else // Regular build - V_DrawThinString(vid.dupx, vid.height - 10*vid.dupy, V_NOSCALESTART|V_TRANSLUCENT|V_ALLOWLOWERCASE, va("%s", VERSIONSTRING)); -#endif - } - } } // focus lost notification goes on top of everything, even the former everything