removed check for registered.integer in GAME_NORMAL naming (this means it just says...

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

diff --git a/common.c b/common.c
index 33a990a011ebf8d6dcc090c24e2991744300799d..cbe05713b993015aec14d8e25ba2efbae69ebd9f 100644 (file)
--- 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 617622cc31d5c6e23819cb7cd6acd6bcf34c8451..3d2275f422a08e7f74b6cec4643516d3dd28d2f7 100644 (file)
--- 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 037b6c8c73331f7b7486ac9d259ac24258a7110c..cdf21317ce1c21013743cd661e7bf299eacf60c6 100644 (file)
--- 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
 };