From 6f92efc72cb87baee5550de42a2b0c489774f704 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 12 Oct 2016 12:43:26 +0200 Subject: [PATCH] - renamed thingdef_codeptr.cpp and moved it out of thingdef/. Ultimately, thingdef should only contain code that is directly related to the DECORATE parser, but that's not the case with this file. It's only function definitions which get used during gameplay and will also be accessed by ZScript. The change is intentionally on master so that pull requests can adjust to it now instead of creating conflicts later. --- src/CMakeLists.txt | 2 +- src/{thingdef/thingdef_codeptr.cpp => p_actionfunctions.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/{thingdef/thingdef_codeptr.cpp => p_actionfunctions.cpp} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 03299bb0a..ebfac3050 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1090,6 +1090,7 @@ set (PCH_SOURCES p_3dfloors.cpp p_3dmidtex.cpp p_acs.cpp + p_actionfunctions.cpp p_buildmap.cpp p_ceiling.cpp p_conversation.cpp @@ -1227,7 +1228,6 @@ set (PCH_SOURCES textures/warptexture.cpp thingdef/olddecorations.cpp thingdef/thingdef.cpp - thingdef/thingdef_codeptr.cpp thingdef/thingdef_data.cpp thingdef/thingdef_exp.cpp thingdef/thingdef_expression.cpp diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/p_actionfunctions.cpp similarity index 100% rename from src/thingdef/thingdef_codeptr.cpp rename to src/p_actionfunctions.cpp