fix C++ compilation errors
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 8 Sep 2009 21:18:17 +0000 (21:18 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Tue, 8 Sep 2009 21:18:17 +0000 (21:18 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9171 d7cf8633-e32d-0410-b094-e92efae38249

fs.c
model_shared.c

diff --git a/fs.c b/fs.c
index 6d20dea..96479bd 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1488,7 +1488,7 @@ static void FS_ListGameDirs(void)
        }
        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]);
index edf096a..b65104b 100644 (file)
@@ -426,7 +426,7 @@ dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk)
                buf = FS_LoadFile (va("%s.framegroups", mod->name), tempmempool, false, &filesize);
                if(buf)
                {
-                       Mod_FrameGroupify(mod, buf);
+                       Mod_FrameGroupify(mod, (const char *)buf);
                        Mem_Free(buf);
                }