added loadsize variable set by COM_LoadFile

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 142af2dc594ca73936bca2c4ccf60b0ba210c679..56d7f5ee031376fc8aa8ac195d2aeaa703f88d82 100644 (file)
--- a/common.c
+++ b/common.c
@@ -20,7 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // common.c -- misc functions used in client and server
 
 #include <fcntl.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 #include <stdlib.h>
@@ -1550,7 +1552,7 @@ int COM_FindFile (char *filename, QFile **file, qboolean quiet, qboolean zip)
        int                             filenamelen;
 
        filenamelen = strlen (filename);
-       snprintf (gzfilename, sizeof (gzfilename), "%s.gz", filename);
+       sprintf (gzfilename, "%s.gz", filename);
 
        if (!file)
                Sys_Error ("COM_FindFile: file not set");
@@ -1658,9 +1660,9 @@ Filename are reletive to the quake directory.
 Always appends a 0 byte.
 ============
 */
-cache_user_t *loadcache;
-byte    *loadbuf;
-int             loadsize;
+cache_user_t   *loadcache;
+byte                   *loadbuf;
+int                            loadsize;
 byte *COM_LoadFile (char *path, int usehunk, qboolean quiet)
 {
        QFile             *h;
@@ -1669,11 +1671,14 @@ byte *COM_LoadFile (char *path, int usehunk, qboolean quiet)
        int             len;
 
        buf = NULL;     // quiet compiler warning
+       loadsize = 0;
 
 // look for it in the filesystem or pack files
        len = COM_FOpenFile (path, &h, quiet, true);
        if (!h)
                return NULL;
+
+       loadsize = len;
        
 // extract the filename base name for hunk tag
        COM_FileBase (path, base);