From f89605698869dec82f71080203ca8de96cec25d8 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 8 Sep 2009 21:18:17 +0000
Subject: [PATCH] fix C++ compilation errors
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9171 d7cf8633-e32d-0410-b094-e92efae38249
---
fs.c | 2 +-
model_shared.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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);
}
--
2.39.5