Merge branch 'Mario/dpk_support' of gitlab.com:xonotic/darkplaces

[xonotic/darkplaces.git] / com_game.c

diff --git a/com_game.c b/com_game.c
index a40f5c401353e6227d642c69c9c612bac708672c..8216bafe50f8a9ea64d6332dcd44d4ecfaa92cd2 100644 (file)
--- a/com_game.c
+++ b/com_game.c
@@ -87,6 +87,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 +110,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 +165,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];
        }