From: Cloudwalk Date: Sat, 31 Jul 2021 16:55:59 +0000 (-0400) Subject: common: Move com_game headers to new com_game.h X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=90ab66ba6bfed05c0ce331d321ff63eba7912637;hp=00b6d96fd1220b1df82036c445389ae19a08709e common: Move com_game headers to new com_game.h --- diff --git a/com_game.c b/com_game.c index 8216bafe..1406989b 100644 --- a/com_game.c +++ b/com_game.c @@ -1,8 +1,5 @@ /* -Copyright (C) 1996-1997 Id Software, Inc. -Copyright (C) 2000-2020 Ashley Rose "LadyHavoc" Hale -Copyright (C) 2020 David "Cloudwalk" Knapp -Copyright (C) 2020 Kristus +Copyright (C) 2000-2021 DarkPlaces contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -21,7 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "quakedef.h" +#include "darkplaces.h" +#include "com_game.h" // Game mods diff --git a/com_game.h b/com_game.h new file mode 100644 index 00000000..4f615568 --- /dev/null +++ b/com_game.h @@ -0,0 +1,84 @@ +/* +Copyright (C) 2000-2021 DarkPlaces contributors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ + +#ifndef COM_GAME_H +#define COM_GAME_H + +#include "qdefs.h" + +typedef enum gamemode_e +{ + GAME_NORMAL, + GAME_HIPNOTIC, + GAME_ROGUE, + GAME_QUOTH, + GAME_NEHAHRA, + GAME_NEXUIZ, + GAME_XONOTIC, + GAME_TRANSFUSION, + GAME_GOODVSBAD2, + GAME_TEU, + GAME_BATTLEMECH, + GAME_ZYMOTIC, + GAME_SETHERAL, + GAME_TENEBRAE, // full of evil hackery + GAME_NEOTERIC, + GAME_OPENQUARTZ, //this game sucks + GAME_PRYDON, + GAME_DELUXEQUAKE, + GAME_THEHUNTED, + GAME_DEFEATINDETAIL2, + GAME_DARSANA, + GAME_CONTAGIONTHEORY, + GAME_EDU2P, + GAME_PROPHECY, + GAME_BLOODOMNICIDE, + GAME_STEELSTORM, // added by motorsep + GAME_STEELSTORM2, // added by motorsep + GAME_SSAMMO, // added by motorsep + GAME_STEELSTORMREVENANTS, // added by motorsep 07/19/2015 + GAME_TOMESOFMEPHISTOPHELES, // added by motorsep + GAME_STRAPBOMB, // added by motorsep for Urre + GAME_MOONHELM, + GAME_VORETOURNAMENT, + GAME_DOOMBRINGER, // added by Cloudwalk for kristus + GAME_BATTLEMETAL, // added by Cloudwalk for Subject9x + GAME_COUNT +} +gamemode_t; + +// Master switch for some hacks/changes that eventually should become cvars. +#define IS_NEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_XONOTIC || (g) == GAME_VORETOURNAMENT) +// Pre-csqcmodels era. +#define IS_OLDNEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_VORETOURNAMENT) + +extern gamemode_t gamemode; +extern const char *gamename; +extern const char *gamenetworkfiltername; +extern const char *gamedirname1; +extern const char *gamedirname2; +extern const char *gamescreenshotname; +extern const char *gameuserdirname; +extern char com_modname[MAX_OSPATH]; + +void COM_InitGameType (void); +void COM_ChangeGameTypeForGameDirs(void); + +#endif diff --git a/common.h b/common.h index 441d9ce9..0fdf97ce 100644 --- a/common.h +++ b/common.h @@ -213,7 +213,6 @@ int COM_ParseToken_Console(const char **datapointer); void COM_Init (void); void COM_Shutdown (void); -void COM_InitGameType (void); char *va(char *buf, size_t buflen, const char *format, ...) DP_FUNC_PRINTF(3); // does a varargs printf into provided buffer, returns buffer (so it can be called in-line unlike dpsnprintf) @@ -271,63 +270,6 @@ typedef enum userdirmode_e } userdirmode_t; -typedef enum gamemode_e -{ - GAME_NORMAL, - GAME_HIPNOTIC, - GAME_ROGUE, - GAME_QUOTH, - GAME_NEHAHRA, - GAME_NEXUIZ, - GAME_XONOTIC, - GAME_TRANSFUSION, - GAME_GOODVSBAD2, - GAME_TEU, - GAME_BATTLEMECH, - GAME_ZYMOTIC, - GAME_SETHERAL, - GAME_TENEBRAE, // full of evil hackery - GAME_NEOTERIC, - GAME_OPENQUARTZ, //this game sucks - GAME_PRYDON, - GAME_DELUXEQUAKE, - GAME_THEHUNTED, - GAME_DEFEATINDETAIL2, - GAME_DARSANA, - GAME_CONTAGIONTHEORY, - GAME_EDU2P, - GAME_PROPHECY, - GAME_BLOODOMNICIDE, - GAME_STEELSTORM, // added by motorsep - GAME_STEELSTORM2, // added by motorsep - GAME_SSAMMO, // added by motorsep - GAME_STEELSTORMREVENANTS, // added by motorsep 07/19/2015 - GAME_TOMESOFMEPHISTOPHELES, // added by motorsep - GAME_STRAPBOMB, // added by motorsep for Urre - GAME_MOONHELM, - GAME_VORETOURNAMENT, - GAME_DOOMBRINGER, // added by Cloudwalk for kristus - GAME_BATTLEMETAL, // added by Cloudwalk for Subject9x - GAME_COUNT -} -gamemode_t; - -// Master switch for some hacks/changes that eventually should become cvars. -#define IS_NEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_XONOTIC || (g) == GAME_VORETOURNAMENT) -// Pre-csqcmodels era. -#define IS_OLDNEXUIZ_DERIVED(g) ((g) == GAME_NEXUIZ || (g) == GAME_VORETOURNAMENT) - -extern gamemode_t gamemode; -extern const char *gamename; -extern const char *gamenetworkfiltername; -extern const char *gamedirname1; -extern const char *gamedirname2; -extern const char *gamescreenshotname; -extern const char *gameuserdirname; -extern char com_modname[MAX_OSPATH]; - -void COM_ChangeGameTypeForGameDirs(void); - void COM_ToLowerString (const char *in, char *out, size_t size_out); void COM_ToUpperString (const char *in, char *out, size_t size_out); int COM_StringBeginsWith(const char *s, const char *match); diff --git a/darkplaces-sdl2-vs2017.vcxproj b/darkplaces-sdl2-vs2017.vcxproj index 85519a61..de80fba5 100644 --- a/darkplaces-sdl2-vs2017.vcxproj +++ b/darkplaces-sdl2-vs2017.vcxproj @@ -332,6 +332,7 @@ + diff --git a/darkplaces-sdl2-vs2019.vcxproj b/darkplaces-sdl2-vs2019.vcxproj index 47ae7893..4722fe33 100644 --- a/darkplaces-sdl2-vs2019.vcxproj +++ b/darkplaces-sdl2-vs2019.vcxproj @@ -333,6 +333,7 @@ + diff --git a/darkplaces.h b/darkplaces.h index f04d904b..512de65f 100644 --- a/darkplaces.h +++ b/darkplaces.h @@ -45,6 +45,7 @@ extern char engineversion[128]; #include "qdefs.h" #include "zone.h" #include "thread.h" +#include "com_game.h" #include "com_infostring.h" #include "common.h" #include "filematch.h"