From 5ff9dbf2dc269135dd6cf59e93b50da73536f35b Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 19 Mar 2005 02:10:54 +0000 Subject: [PATCH] added GAME_THEHUNTED git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5095 d7cf8633-e32d-0410-b094-e92efae38249 --- common.c | 5 ++++- common.h | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/common.c b/common.c index 09acf582..572c2b11 100644 --- a/common.c +++ b/common.c @@ -40,7 +40,7 @@ const char **com_argv; #define CMDLINE_LENGTH 1024 char com_cmdline[CMDLINE_LENGTH]; -int gamemode; +gamemode_t gamemode; const char *gamename; const char *gamedirname1; const char *gamedirname2; @@ -982,6 +982,9 @@ static const gamemode_info_t gamemode_info [] = // GAME_NETHERWORLD // COMMANDLINEOPTION: Game: -netherworld runs the game Netherworld: Dark Masters { "netherworld", "-netherworld", "Dark Masters", "id1", "netherworld", "nw", "darkplaces"}, +// GAME_THEHUNTED +// COMMANDLINEOPTION: Game: -netherworld runs the game The Hunted +{ "thehunted", "-thehunted", "The Hunted", "thdata", NULL, "th", "thehunted"}, }; void COM_InitGameType (void) diff --git a/common.h b/common.h index 891f6783..990ab6de 100644 --- a/common.h +++ b/common.h @@ -197,26 +197,31 @@ extern int dpvsnprintf (char *buffer, size_t buffersize, const char *format, va_ extern struct cvar_s registered; extern struct cvar_s cmdline; -#define GAME_NORMAL 0 -#define GAME_HIPNOTIC 1 -#define GAME_ROGUE 2 -#define GAME_NEHAHRA 3 -#define GAME_NEXUIZ 4 -#define GAME_TRANSFUSION 5 -#define GAME_GOODVSBAD2 6 -#define GAME_TEU 7 -#define GAME_BATTLEMECH 8 -#define GAME_ZYMOTIC 9 -#define GAME_FNIGGIUM 10 -#define GAME_SETHERAL 11 -#define GAME_SOM 12 -#define GAME_TENEBRAE 13 // full of evil hackery -#define GAME_NEOTERIC 14 -#define GAME_OPENQUARTZ 15 //this game sucks -#define GAME_PRYDON 16 -#define GAME_NETHERWORLD 17 - -extern int gamemode; +typedef enum gamemode_e +{ + GAME_NORMAL, + GAME_HIPNOTIC, + GAME_ROGUE, + GAME_NEHAHRA, + GAME_NEXUIZ, + GAME_TRANSFUSION, + GAME_GOODVSBAD2, + GAME_TEU, + GAME_BATTLEMECH, + GAME_ZYMOTIC, + GAME_FNIGGIUM, + GAME_SETHERAL, + GAME_SOM, + GAME_TENEBRAE, // full of evil hackery + GAME_NEOTERIC, + GAME_OPENQUARTZ, //this game sucks + GAME_PRYDON, + GAME_NETHERWORLD, + GAME_THEHUNTED, +} +gamemode_t; + +extern gamemode_t gamemode; extern const char *gamename; extern const char *gamedirname1; extern const char *gamedirname2; -- 2.39.2