ODE: add two missing symbols

[xonotic/darkplaces.git] / fs.c

diff --git a/fs.c b/fs.c
index 41f279cc8ab725d4ae56740e95deb510748a8802..96479bd8e519c13a00d3f4b768c9385f4f052cbe 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1038,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;
 
@@ -1247,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)
@@ -1453,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;
@@ -1485,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]);
@@ -2838,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)
@@ -3334,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;
@@ -3427,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);