From eb40e8bcf0a035e1922119bcf1b44877719455b1 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 22 Feb 2017 23:02:58 +0200 Subject: [PATCH] Removed DYNLIGHT preprocessor definition https://mantis.zdoom.org/view.php?id=318 --- src/scripting/decorate/thingdef_states.cpp | 4 +--- src/scripting/zscript/zcc_compile.cpp | 3 +-- src/version.h | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/scripting/decorate/thingdef_states.cpp b/src/scripting/decorate/thingdef_states.cpp index 74c67cf84..b3d4c904a 100644 --- a/src/scripting/decorate/thingdef_states.cpp +++ b/src/scripting/decorate/thingdef_states.cpp @@ -315,9 +315,7 @@ do_stop: do { sc.MustGetString(); - #ifdef DYNLIGHT - AddStateLight(&state, sc.String); - #endif + AddStateLight(&state, sc.String); } while (sc.CheckString(",")); sc.MustGetStringName(")"); diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index 29f82d90e..b28226efb 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -2562,7 +2562,7 @@ void ZCCCompiler::CompileStates() state.Misc1 = IntConstFromNode(sl->Offset, c->Type()); state.Misc2 = IntConstFromNode(static_cast(sl->Offset->SiblingNext), c->Type()); } -#ifdef DYNLIGHT + if (sl->Lights != nullptr) { auto l = sl->Lights; @@ -2572,7 +2572,6 @@ void ZCCCompiler::CompileStates() l = static_cast(l->SiblingNext); } while (l != sl->Lights); } -#endif if (sl->Action != nullptr) { diff --git a/src/version.h b/src/version.h index 5ee5472f2..a03c6a21e 100644 --- a/src/version.h +++ b/src/version.h @@ -87,8 +87,6 @@ const char *GetVersionString(); // SVN revision ever got. #define SAVEVER 4550 -#define DYNLIGHT - // This is so that derivates can use the same savegame versions without worrying about engine compatibility #define GAMESIG "GZDOOM" #define BASEWAD "gzdoom.pk3"