Slightly tweaked CL_ParticleExplosion2 by VorteX.

[xonotic/darkplaces.git] / fs.c

diff --git a/fs.c b/fs.c
index 3ecac6915545f12baeb1533bfc9172d30d9c7cce..9eb46843f796fff86a8c3d1cf32e9bfdb3d78c97 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -25,8 +25,6 @@
 
 #include "quakedef.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <limits.h>
 #include <fcntl.h>
 
@@ -891,6 +889,8 @@ void FS_Init (void)
        fs_mempool = Mem_AllocPool("file management");
        pak_mempool = Mem_AllocPool("paks");
 
+       Cvar_RegisterVariable (&scr_screenshot_name);
+
        Cmd_AddCommand ("path", FS_Path_f);
        Cmd_AddCommand ("dir", FS_Dir_f);
        Cmd_AddCommand ("ls", FS_Ls_f);
@@ -946,6 +946,7 @@ void FS_Init (void)
        // start up with GAMENAME by default (id1)
        strlcpy (com_modname, GAMENAME, sizeof (com_modname));
        FS_AddGameDirectory (va("%s/"GAMENAME, fs_basedir));
+       Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname);
 
        // add the game-specific path, if any
        if (gamedirname[0])
@@ -957,12 +958,19 @@ void FS_Init (void)
 
        // -game <gamedir>
        // Adds basedir/gamedir as an override game
-       i = COM_CheckParm ("-game");
-       if (i && i < com_argc-1)
+       // LordHavoc: now supports multiple -game directories
+       for (i = 1;i < com_argc;i++)
        {
-               fs_modified = true;
-               strlcpy (com_modname, com_argv[i+1], sizeof (com_modname));
-               FS_AddGameDirectory (va("%s/%s", fs_basedir, com_argv[i+1]));
+               if (!com_argv[i])
+                       continue;
+               if (!strcmp (com_argv[i], "-game") && i < com_argc-1)
+               {
+                       i++;
+                       fs_modified = true;
+                       strlcpy (com_modname, com_argv[i], sizeof (com_modname));
+                       FS_AddGameDirectory (va("%s/%s", fs_basedir, com_argv[i]));
+                       Cvar_SetQuick (&scr_screenshot_name, com_modname);
+               }
        }
 }