From 3b6d4a802e35f12543af6aca48a5c8c23369aec8 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 23 Aug 2002 06:12:01 +0000
Subject: [PATCH] removed check for registered.integer in GAME_NORMAL naming
 (this means it just says DarkPlaces-Quake whether the game is registered or
 not) removed support for games FiendArena (because I have not heard from the
 author in a long time) and Zymotic (because the game was canceled long ago)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2281 d7cf8633-e32d-0410-b094-e92efae38249
---
 common.c | 23 ++---------------------
 common.h |  4 +---
 menu.c   |  2 --
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/common.c b/common.c
index 33a990a0..cbe05713 100644
--- a/common.c
+++ b/common.c
@@ -751,16 +751,12 @@ void COM_InitArgv (void)
 
 void COM_InitGameType (void)
 {
-	char name[128];
+	char name[MAX_OSPATH];
 	COM_StripExtension(com_argv[0], name);
 	COM_ToLowerString(name, name);
 
 	if (strstr(name, "transfusion"))
 		gamemode = GAME_TRANSFUSION;
-	else if (strstr(name, "zymotic"))
-		gamemode = GAME_ZYMOTIC;
-	else if (strstr(name, "fiendarena"))
-		gamemode = GAME_FIENDARENA;
 	else if (strstr(name, "nehahra"))
 		gamemode = GAME_NEHAHRA;
 	else if (strstr(name, "hipnotic"))
@@ -772,10 +768,6 @@ void COM_InitGameType (void)
 
 	if (COM_CheckParm ("-transfusion"))
 		gamemode = GAME_TRANSFUSION;
-	else if (COM_CheckParm ("-zymotic"))
-		gamemode = GAME_ZYMOTIC;
-	else if (COM_CheckParm ("-fiendarena"))
-		gamemode = GAME_FIENDARENA;
 	else if (COM_CheckParm ("-nehahra"))
 		gamemode = GAME_NEHAHRA;
 	else if (COM_CheckParm ("-hipnotic"))
@@ -788,10 +780,7 @@ void COM_InitGameType (void)
 	switch(gamemode)
 	{
 	case GAME_NORMAL:
-		if (registered.integer)
-			gamename = "DarkPlaces-Quake";
-		else
-			gamename = "DarkPlaces-SharewareQuake";
+		gamename = "DarkPlaces-Quake";
 		gamedirname = "";
 		break;
 	case GAME_HIPNOTIC:
@@ -806,14 +795,6 @@ void COM_InitGameType (void)
 		gamename = "DarkPlaces-Nehahra";
 		gamedirname = "nehahra";
 		break;
-	case GAME_FIENDARENA:
-		gamename = "FiendArena";
-		gamedirname = "fiendarena";
-		break;
-	case GAME_ZYMOTIC:
-		gamename = "Zymotic";
-		gamedirname = "zymotic";
-		break;
 	case GAME_TRANSFUSION:
 		gamename = "Transfusion";
 		gamedirname = "transfusion";
diff --git a/common.h b/common.h
index 617622cc..3d2275f4 100644
--- a/common.h
+++ b/common.h
@@ -171,9 +171,7 @@ extern	struct cvar_s	registered;
 #define GAME_HIPNOTIC 1
 #define GAME_ROGUE 2
 #define GAME_NEHAHRA 3
-#define GAME_FIENDARENA 4
-#define GAME_ZYMOTIC 5
-#define GAME_TRANSFUSION 6
+#define GAME_TRANSFUSION 4
 
 extern int gamemode;
 extern char *gamename;
diff --git a/menu.c b/menu.c
index 037b6c8c..cdf21317 100644
--- a/menu.c
+++ b/menu.c
@@ -2583,8 +2583,6 @@ gameinfo_t gamelist[] =
 	{GAME_HIPNOTIC, &hipnoticgame, &hipnoticgame},
 	{GAME_ROGUE, &roguegame, &roguegame},
 	{GAME_NEHAHRA, &nehahragame, &nehahragame},
-	{GAME_FIENDARENA, &sharewarequakegame, &registeredquakegame},
-	{GAME_ZYMOTIC, &sharewarequakegame, &registeredquakegame},
 	{GAME_TRANSFUSION, &transfusiongame, &transfusiongame},
 	{-1, &sharewarequakegame, &registeredquakegame} // final fallback
 };
-- 
2.39.2