diff --git a/src/gametype.h b/src/gametype.h index 69eeae545..56c1564f6 100644 --- a/src/gametype.h +++ b/src/gametype.h @@ -10,7 +10,6 @@ enum EGameType GAME_Chex = 16, //Chex is basically Doom, but we need to have a different set of actors. GAME_Raven = GAME_Heretic|GAME_Hexen, - GAME_DoomStrife = GAME_Doom|GAME_Strife, GAME_DoomChex = GAME_Doom|GAME_Chex, GAME_DoomStrifeChex = GAME_Doom|GAME_Strife|GAME_Chex }; diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 3a7e0794f..686ed12f6 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -361,14 +361,7 @@ void M_SetMenu(FName menu, int param) if ((gameinfo.flags & GI_SHAREWARE) && param > 0) { // Only Doom and Heretic have multi-episode shareware versions. - if (gameinfo.gametype == GAME_Doom) - { - M_StartMessage(GStrings("SWSTRING"), 1); - } - else - { - M_StartMessage(GStrings("MNU_ONLYREGISTERED"), 1); - } + M_StartMessage(GStrings("SWSTRING"), 1); return; } diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 57b8fcce7..f3fb2bcef 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -1559,7 +1559,7 @@ MNU_PLAYERSETUP = "PLAYER SETUP"; MNU_DELETESG = "Do you really want to delete the savegame\n"; -MNU_ONLYREGISTERED = "ONLY AVAILABLE IN THE REGISTERED VERSION"; +$ifgame(heretic) SWSTRING = "ONLY AVAILABLE IN THE REGISTERED VERSION"; MNU_EPISODE = "Select Episode"; diff --git a/wadsrc/static/language.fr b/wadsrc/static/language.fr index b88551902..354ba2bee 100644 --- a/wadsrc/static/language.fr +++ b/wadsrc/static/language.fr @@ -1369,7 +1369,7 @@ MNU_PLAYERSETUP = "REGLAGE DU JOUEUR"; MNU_DELETESG = "Voulez vous vraiment effacer cette sauvegarde?\n"; -MNU_ONLYREGISTERED = "SEULEMENT DISPONIBLE DANS LA VERSION ENREGISTREE"; +$ifgame(heretic) SWSTRING = "SEULEMENT DISPONIBLE DANS LA VERSION ENREGISTREE"; // Bloodbath announcer