tweak the start time of the level a bit to cause items to spawn before

[xonotic/darkplaces.git] / fs.c

diff --git a/fs.c b/fs.c
index 119499f9b445d62c5723aac1a8bca8590863bd4a..1dc6a8b5a62ddf05f27188db1183a8beb2e78b60 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -313,7 +313,7 @@ char fs_basedir[MAX_OSPATH];
 int fs_numgamedirs = 0;
 char fs_gamedirs[MAX_GAMEDIRS][MAX_QPATH];
 
-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)"};
+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 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"};
 
 
@@ -3208,7 +3208,7 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat
        strm.next_in = (unsigned char*)data;
        strm.avail_in = size;
 
-       tmp = Mem_Alloc(tempmempool, size);
+       tmp = (unsigned char *) Mem_Alloc(tempmempool, size);
        if(!tmp)
        {
                Con_Printf("FS_Deflate: not enough memory in tempmempool!\n");
@@ -3241,7 +3241,7 @@ unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflat
                return NULL;
        }
 
-       out = Mem_Alloc(mempool, strm.total_out);
+       out = (unsigned char *) Mem_Alloc(mempool, strm.total_out);
        if(!out)
        {
                Con_Printf("FS_Deflate: not enough memory in target mempool!\n");
@@ -3266,7 +3266,7 @@ static void AssertBufsize(sizebuf_t *buf, int length)
                unsigned char *olddata;
                olddata = buf->data;
                buf->maxsize += length;
-               buf->data = Mem_Alloc(tempmempool, buf->maxsize);
+               buf->data = (unsigned char *) Mem_Alloc(tempmempool, buf->maxsize);
                if(olddata)
                {
                        memcpy(buf->data, olddata, oldsize);
@@ -3285,7 +3285,7 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat
        sizebuf_t outbuf;
 
        memset(&outbuf, 0, sizeof(outbuf));
-       outbuf.data = Mem_Alloc(tempmempool, sizeof(tmp));
+       outbuf.data = (unsigned char *) Mem_Alloc(tempmempool, sizeof(tmp));
        outbuf.maxsize = sizeof(tmp);
 
        memset(&strm, 0, sizeof(strm));
@@ -3347,7 +3347,7 @@ unsigned char *FS_Inflate(const unsigned char *data, size_t size, size_t *inflat
 
        qz_inflateEnd(&strm);
 
-       out = Mem_Alloc(mempool, outbuf.cursize);
+       out = (unsigned char *) Mem_Alloc(mempool, outbuf.cursize);
        if(!out)
        {
                Con_Printf("FS_Inflate: not enough memory in target mempool!\n");