From 2a02b9129c33a46f2dd20dba7f6068772aa8c080 Mon Sep 17 00:00:00 2001 From: spookerton Date: Mon, 26 Sep 2022 22:53:07 +0100 Subject: [PATCH] moved sdmm defines to as early as possible in env --- code/{__defines/spaceman_dmm.dm => __spaceman_dmm.dm} | 7 ++++--- polaris.dme | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename code/{__defines/spaceman_dmm.dm => __spaceman_dmm.dm} (85%) diff --git a/code/__defines/spaceman_dmm.dm b/code/__spaceman_dmm.dm similarity index 85% rename from code/__defines/spaceman_dmm.dm rename to code/__spaceman_dmm.dm index 94f1743377..51b09cd036 100644 --- a/code/__defines/spaceman_dmm.dm +++ b/code/__spaceman_dmm.dm @@ -1,7 +1,8 @@ -// Interfaces for the SpacemanDMM linter, define'd to nothing when the linter -// is not in use. +/** +* SpacemanDMM dreamchecker extensions for suite 1.7 +* +*/ -// The SPACEMAN_DMM define is set by the linter and other tooling when it runs. #ifdef SPACEMAN_DMM #define RETURN_TYPE(X) set SpacemanDMM_return_type = X #define SHOULD_CALL_PARENT(X) set SpacemanDMM_should_call_parent = X diff --git a/polaris.dme b/polaris.dme index 15aad86337..e001e8c1d2 100644 --- a/polaris.dme +++ b/polaris.dme @@ -10,6 +10,7 @@ #define DEBUG // END_PREFERENCES // BEGIN_INCLUDE +#include "code\__spaceman_dmm.dm" #include "code\_macros.dm" #include "code\_map_tests.dm" #include "code\_unit_tests.dm" @@ -65,7 +66,6 @@ #include "code\__defines\rust_g.dm" #include "code\__defines\shuttle.dm" #include "code\__defines\sound.dm" -#include "code\__defines\spaceman_dmm.dm" #include "code\__defines\species_languages.dm" #include "code\__defines\sqlite_defines.dm" #include "code\__defines\subsystems.dm"