From 7f4185198c951aae0f2874f31a3e39912e18bd83 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 27 Mar 2013 01:38:21 +0000
Subject: [PATCH] MSVC build fixes. The change to Makefile.deps is slightly
 questionable but it's not really an issue.

git-svn-id: https://svn.eduke32.com/eduke32@3613 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile.deps   | 5 +----
 polymer/eduke32/source/premap.c | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/polymer/eduke32/Makefile.deps b/polymer/eduke32/Makefile.deps
index 8afc39452..b90b4aa3a 100644
--- a/polymer/eduke32/Makefile.deps
+++ b/polymer/eduke32/Makefile.deps
@@ -31,10 +31,7 @@ duke3d_h=\
 
 gamedef_h=$(SRC)/gamedef.h $(SRC)/gameexec.h $(SRC)/gamevars.h
 
-game_defs_dep=
-ifneq ($(LUNATIC),0)
-    game_defs_dep=$(SRC)/lunatic/defs.ilua
-endif
+game_defs_dep=$(SRC)/lunatic/defs.ilua
 
 $(OBJ)/game.$o: $(SRC)/game.c $(game_defs_dep) $(SRC)/jmact/scriplib.h $(duke3d_h) $(SRC)/input.h $(INC)/osdfuncs.h $(INC)/osdcmds.h $(INC)/grpscan.h $(INC)/demo.h $(EINC)/hightile.h
 $(OBJ)/actors.$o: $(SRC)/actors.c $(duke3d_h)
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index 8a4bd7d43..4a99f8da0 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -1063,7 +1063,7 @@ static inline void prelevel(char g)
 {
     int32_t i, nexti, j, startwall, endwall;
     int32_t switchpicnum;
-    uint8_t *tagbitmap = Bcalloc(65536>>3, 1);
+    uint8_t *tagbitmap = (uint8_t *)Bcalloc(65536>>3, 1);
 
     if (tagbitmap==NULL)
         G_GameExit("OUT OF MEMORY in prelevel()");