X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=com_game.c;h=1406989ba6e4a9c6fccc840a6f650bbf15cb77c5;hb=f2b9b8d7f630a2503b35efc8027c2e0930b7b476;hp=a40f5c401353e6227d642c69c9c612bac708672c;hpb=3056ff737a00f0f95604eaa12af52b20d60a84a6;p=xonotic%2Fdarkplaces.git

diff --git a/com_game.c b/com_game.c
index a40f5c40..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 <kristustf@gmail.com>
+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
 
@@ -87,6 +85,7 @@ static const gamemode_info_t gamemode_info [GAME_COUNT] =
 { GAME_MOONHELM,				GAME_MOONHELM,				"moonhelm",				"-moonhelm",				"MoonHelm",					"MoonHelm",					"data",		NULL,			"mh",				"moonhelm"				}, // COMMANDLINEOPTION: Game: -moonhelm runs the game MoonHelm
 { GAME_VORETOURNAMENT,			GAME_VORETOURNAMENT,		"voretournament",		"-voretournament",			"Vore Tournament",			"Vore_Tournament",			"data",		NULL,			"voretournament",	"voretournament"		}, // COMMANDLINEOPTION: Game: -voretournament runs the multiplayer game Vore Tournament
 { GAME_DOOMBRINGER,				GAME_DOOMBRINGER,			"doombringer",			"-doombringer",				"DOOMBRINGER",				"DOOMBRINGER",				"dbdata",	NULL,			"doombringer",		"doombringer"			}, // COMMANDLINEOPTION: Game: -doombringer runs the game DOOMBRINGER
+{ GAME_BATTLEMETAL,				GAME_NORMAL,				"battlemetal",			"-battlemetal",				"battlemetal",				"battlemetal",				"metaldata",	NULL,		"battlemetal",		"battlemetal"			}, // COMMANDLINEOPTION: Game: -battlemetal runs the game battleMETAL
 };
 
 static void COM_SetGameType(int index);
@@ -109,7 +108,7 @@ void COM_InitGameType (void)
 
 	// check commandline options for keywords
 	for (i = 0;i < (int)(sizeof (gamemode_info) / sizeof (gamemode_info[0]));i++)
-		if (COM_CheckParm (gamemode_info[i].cmdline))
+		if (Sys_CheckParm (gamemode_info[i].cmdline))
 			index = i;
 
 	com_startupgamemode = gamemode_info[index].mode;
@@ -164,17 +163,17 @@ static void COM_SetGameType(int index)
 
 	if (gamemode == com_startupgamemode)
 	{
-		if((t = COM_CheckParm("-customgamename")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgamename")) && t + 1 < sys.argc)
 			gamename = gamenetworkfiltername = sys.argv[t+1];
-		if((t = COM_CheckParm("-customgamenetworkfiltername")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgamenetworkfiltername")) && t + 1 < sys.argc)
 			gamenetworkfiltername = sys.argv[t+1];
-		if((t = COM_CheckParm("-customgamedirname1")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgamedirname1")) && t + 1 < sys.argc)
 			gamedirname1 = sys.argv[t+1];
-		if((t = COM_CheckParm("-customgamedirname2")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgamedirname2")) && t + 1 < sys.argc)
 			gamedirname2 = *sys.argv[t+1] ? sys.argv[t+1] : NULL;
-		if((t = COM_CheckParm("-customgamescreenshotname")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgamescreenshotname")) && t + 1 < sys.argc)
 			gamescreenshotname = sys.argv[t+1];
-		if((t = COM_CheckParm("-customgameuserdirname")) && t + 1 < sys.argc)
+		if((t = Sys_CheckParm("-customgameuserdirname")) && t + 1 < sys.argc)
 			gameuserdirname = sys.argv[t+1];
 	}