Merge PR 'sv_gameplayfix_stepmultipletimes 1: Prevent players moving too far/fast...

[xonotic/darkplaces.git] / com_game.c

diff --git a/com_game.c b/com_game.c
index e4f5e22774d6d04b8d7106c55fe9a216c8d76f34..1406989ba6e4a9c6fccc840a6f650bbf15cb77c5 100644 (file)
--- a/com_game.c
+++ b/com_game.c
@@ -1,4 +1,25 @@
-#include "quakedef.h"
+/*
+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.
+
+*/
+
+#include "darkplaces.h"
+#include "com_game.h"
 
 // Game mods
 
@@ -64,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);
@@ -86,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;
@@ -141,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];
        }