diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 917020a75..e4b222fe9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -209,8 +209,6 @@ set(SRB2_CONFIG_DEV_BUILD OFF CACHE BOOL "Compile a development build of Dr Robotnik's Ring Racers.") set(SRB2_CONFIG_TESTERS OFF CACHE BOOL "Compile a build for testers.") -set(SRB2_CONFIG_HOSTTESTERS OFF CACHE BOOL - "Compile a build to host netgames for testers builds.") add_subdirectory(blua) @@ -556,9 +554,6 @@ endif() if(SRB2_CONFIG_TESTERS) target_compile_definitions(SRB2SDL2 PRIVATE -DTESTERS) endif() -if(SRB2_CONFIG_HOSTTESTERS) - target_compile_definitions(SRB2SDL2 PRIVATE -DHOSTTESTERS) -endif() if(SRB2_CONFIG_MOBJCONSISTANCY) target_compile_definitions(SRB2SDL2 PRIVATE -DMOBJCONSISTANCY) endif() diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index c8e43b6ea..7290de68b 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -6,7 +6,7 @@ passthru_opts+=\ NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\ MOBJCONSISTANCY PACKETDROP ZDEBUG\ HAVE_MINIUPNPC\ - HAVE_DISCORDRPC TESTERS HOSTTESTERS DEVELOP + HAVE_DISCORDRPC TESTERS DEVELOP # build with debugging information ifdef DEBUGMODE diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 55177cede..0663f22e3 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -4638,8 +4638,6 @@ static void Command_Version_f(void) // DEVELOP build #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 4b4c87941..5ded47495 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -1565,9 +1565,6 @@ void F_VersionDrawer(void) #if defined(TESTERS) addtext(V_SKYMAP, "Tester client"); addtext(V_TRANSLUCENT, va("%s", compdate)); -#elif defined(HOSTTESTERS) - addtext(V_REDMAP, "Netgame host for testers"); - addtext(V_TRANSLUCENT, va("%s", compdate)); #elif defined(DEVELOP) addtext(V_TRANSLUCENT, va("%s %s", comprevision, compnote)); addtext(V_TRANSLUCENT, D_GetFancyBranchName()); @@ -1711,8 +1708,6 @@ void F_TitleScreenDrawer(void) #ifdef DEVELOP #if defined(TESTERS) V_DrawCenteredString(BASEVIDWIDTH/2, 96, V_SKYMAP, "Tester EXE"); -#elif defined(HOSTTESTERS) - V_DrawCenteredThinString(BASEVIDWIDTH/2, 96, V_REDMAP, "Tester netgame host EXE"); #else V_DrawCenteredString(BASEVIDWIDTH/2, 96, 0, "Development EXE"); #endif diff --git a/src/g_game.c b/src/g_game.c index d78bc3f11..0cce5ff8c 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -89,7 +89,7 @@ JoyType_t Joystick[MAXSPLITSCREENPLAYERS]; // SRB2kart char gamedatafilename[64] = -#if defined (TESTERS) || defined (HOSTTESTERS) +#if defined (TESTERS) "test" #elif defined(DEVELOP) "develop"