From b669d248178a88c20d01384fe66b7294f4fd3d07 Mon Sep 17 00:00:00 2001 From: yellowtd <ren_amon@hotmail.com> Date: Thu, 26 May 2016 01:48:03 -0400 Subject: [PATCH] misc fixes/corrections for 2.1.15 compiling misc. fixes to get the stupid setup to compile, again --- src/dehacked.h | 3 --- src/hardware/hw_light.h | 2 -- src/hardware/hw_main.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/dehacked.h b/src/dehacked.h index 413dfd993a..8832216b84 100644 --- a/src/dehacked.h +++ b/src/dehacked.h @@ -41,9 +41,6 @@ void DEH_Check(void); fixed_t get_number(const char *word); -//yellowtd: make get_mus an extern -extern UINT16 get_mus(const char *word); - #ifdef HAVE_BLUA boolean LUA_SetLuaAction(void *state, const char *actiontocompare); const char *LUA_GetActionName(void *action); diff --git a/src/hardware/hw_light.h b/src/hardware/hw_light.h index d98930de5e..f3085e7adc 100644 --- a/src/hardware/hw_light.h +++ b/src/hardware/hw_light.h @@ -22,8 +22,6 @@ #include "hw_glob.h" #include "hw_defs.h" -#define ALAM_LIGHTING //yellowtd: Define ALAM_LIGHTING for this branch - #define NUMLIGHTFREESLOTS 32 // Free light slots (for SOCs) #ifdef ALAM_LIGHTING diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 9e957bc568..96b211a075 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -544,7 +544,7 @@ static void HWR_RenderPlane(sector_t *shittyUnusedVariable, extrasubsector_t *xs static FOutVector *planeVerts = NULL; static UINT16 numAllocedPlaneVerts = 0; - (void)sector; ///@TODO remove shitty unused variable + (void)shittyUnusedVariable; ///@TODO remove shitty unused variable // no convex poly were generated for this subsector if (!xsub->planepoly) -- GitLab