X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=fs.c;h=96479bd8e519c13a00d3f4b768c9385f4f052cbe;hb=93aadab2b3dc04d31969cd7a000d0c43573d8913;hp=18c98c6be5dcad6928528e8279ba56b6b72c9743;hpb=4b164eed56b6a99c6abde650578d7a30c0e51bf1;p=xonotic%2Fdarkplaces.git

diff --git a/fs.c b/fs.c
index 18c98c6b..96479bd8 100644
--- a/fs.c
+++ b/fs.c
@@ -321,8 +321,9 @@ char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH];
 gamedir_t *fs_all_gamedirs = NULL;
 int fs_all_gamedirs_count = 0;
 
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running; the date is encoded using strftime escapes)"};
+cvar_t scr_screenshot_name = {CVAR_NORESETTODEFAULTS, "scr_screenshot_name","dp", "prefix name for saved screenshots (changes based on -game commandline, as well as which game mode is running; the date is encoded using strftime escapes)"};
 cvar_t fs_empty_files_in_pack_mark_deletions = {0, "fs_empty_files_in_pack_mark_deletions", "0", "if enabled, empty files in a pak/pk3 count as not existing but cancel the search in further packs, effectively allowing patch pak/pk3 files to 'delete' files"};
+cvar_t cvar_fs_gamedir = {CVAR_READONLY | CVAR_NORESETTODEFAULTS, "fs_gamedir", "", "the list of currently selected gamedirs (use the 'gamedir' command to change this)"};
 
 
 /*
@@ -1037,7 +1038,7 @@ FS_AddPack
  */
 qboolean FS_AddPack(const char *pakfile, qboolean *already_loaded, qboolean keep_plain_dirs)
 {
-	char fullpath[MAX_QPATH];
+	char fullpath[MAX_OSPATH];
 	int index;
 	searchpath_t *search;
 
@@ -1204,6 +1205,7 @@ void FS_Rescan (void)
 {
 	int i;
 	qboolean fs_modified = false;
+	char gamedirbuf[MAX_INPUTLINE];
 
 	FS_ClearSearchPath();
 
@@ -1225,13 +1227,19 @@ void FS_Rescan (void)
 	// Adds basedir/gamedir as an override game
 	// LordHavoc: now supports multiple -game directories
 	// set the com_modname (reported in server info)
+	*gamedirbuf = 0;
 	for (i = 0;i < fs_numgamedirs;i++)
 	{
 		fs_modified = true;
 		FS_AddGameHierarchy (fs_gamedirs[i]);
 		// update the com_modname (used server info)
 		strlcpy (com_modname, fs_gamedirs[i], sizeof (com_modname));
+		if(i)
+			strlcat(gamedirbuf, va(" %s", fs_gamedirs[i]), sizeof(gamedirbuf));
+		else
+			strlcpy(gamedirbuf, fs_gamedirs[i], sizeof(gamedirbuf));
 	}
+	Cvar_SetQuick(&cvar_fs_gamedir, gamedirbuf); // so QC or console code can query it
 
 	// set the default screenshot name to either the mod name or the
 	// gamemode screenshot name
@@ -1239,6 +1247,9 @@ void FS_Rescan (void)
 		Cvar_SetQuick (&scr_screenshot_name, com_modname);
 	else
 		Cvar_SetQuick (&scr_screenshot_name, gamescreenshotname);
+	
+	if((i = COM_CheckParm("-modname")) && i < com_argc - 1)
+		strlcpy(com_modname, com_argv[i+1], sizeof(com_modname));
 
 	// If "-condebug" is in the command line, remove the previous log file
 	if (COM_CheckParm ("-condebug") != 0)
@@ -1445,7 +1456,7 @@ const char *FS_CheckGameDir(const char *gamedir)
 	return fs_checkgamedir_missing;
 }
 
-static void FS_ListGameDirs()
+static void FS_ListGameDirs(void)
 {
 	stringlist_t list, list2;
 	int i, j;
@@ -1477,7 +1488,7 @@ static void FS_ListGameDirs()
 	}
 	stringlistfreecontents(&list);
 
-	fs_all_gamedirs = Mem_Alloc(fs_mempool, list2.numstrings * sizeof(*fs_all_gamedirs));
+	fs_all_gamedirs = (gamedir_t *)Mem_Alloc(fs_mempool, list2.numstrings * sizeof(*fs_all_gamedirs));
 	for(i = 0; i < list2.numstrings; ++i)
 	{
 		info = FS_CheckGameDir(list2.strings[i]);
@@ -1575,9 +1586,9 @@ void FS_Init (void)
 		{
 #if _MSC_VER >= 1400
 			int fd;
-			_sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here!
+			_sopen_s(&fd, va("%s%s/config.cfg", fs_basedir, gamedirname1), O_WRONLY | O_CREAT, _SH_DENYNO, _S_IREAD | _S_IWRITE); // note: no O_TRUNC here!
 #else
-			int fd = open (va("%s%s/config.cfg", fs_basedir, dir), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here!
+			int fd = open (va("%s%s/config.cfg", fs_basedir, gamedirname1), O_WRONLY | O_CREAT, 0666); // note: no O_TRUNC here!
 #endif
 			if(fd >= 0)
 			{
@@ -1671,6 +1682,7 @@ void FS_Init_Commands(void)
 {
 	Cvar_RegisterVariable (&scr_screenshot_name);
 	Cvar_RegisterVariable (&fs_empty_files_in_pack_mark_deletions);
+	Cvar_RegisterVariable (&cvar_fs_gamedir);
 
 	Cmd_AddCommand ("gamedir", FS_GameDir_f, "changes active gamedir list (can take multiple arguments), not including base directory (example usage: gamedir ctf)");
 	Cmd_AddCommand ("fs_rescan", FS_Rescan_f, "rescans filesystem for new pack archives and any other changes");
@@ -2829,7 +2841,7 @@ Look for a file in the packages and in the filesystem
 int FS_FileType (const char *filename)
 {
 	searchpath_t *search;
-	char fullpath[MAX_QPATH];
+	char fullpath[MAX_OSPATH];
 
 	search = FS_FindFile (filename, NULL, true);
 	if(!search)
@@ -3325,6 +3337,10 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat
 	unsigned char *out = NULL;
 	unsigned char *tmp;
 
+	*deflated_size = 0;
+	if(!zlib_dll)
+		return NULL;
+
 	memset(&strm, 0, sizeof(strm));
 	strm.zalloc = Z_NULL;
 	strm.zfree = Z_NULL;
@@ -3418,6 +3434,10 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat
 	unsigned int have;
 	sizebuf_t outbuf;
 
+	*inflated_size = 0;
+	if(!zlib_dll)
+		return NULL;
+
 	memset(&outbuf, 0, sizeof(outbuf));
 	outbuf.data = (unsigned char *) Mem_Alloc(tempmempool, sizeof(tmp));
 	outbuf.maxsize = sizeof(tmp);