From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 8 Sep 2009 21:18:17 +0000 (+0000)
Subject: fix C++ compilation errors
X-Git-Tag: xonotic-v0.1.0preview~1461
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f89605698869dec82f71080203ca8de96cec25d8;p=xonotic%2Fdarkplaces.git

fix C++ compilation errors


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9171 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/fs.c b/fs.c
index 6d20dea7..96479bd8 100644
--- 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]);
diff --git a/model_shared.c b/model_shared.c
index edf096aa..b65104b9 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -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);
 		}