Merge pull request #5070 from CHOMPStation2/upstream-merge-13831

[MIRROR] [MIRROR] moved sdmm defines to as early as possible in env [ABLE TO BE MERGED]
This commit is contained in:
Razgriz
2022-10-02 22:09:00 -07:00
committed by GitHub
2 changed files with 5 additions and 4 deletions

View File

@@ -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
* <https://github.com/SpaceManiac/SpacemanDMM/tree/suite-1.7/src/dreamchecker>
*/
// 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

View File

@@ -10,6 +10,7 @@
#define DEBUG
// END_PREFERENCES
// BEGIN_INCLUDE
#include "code\__spaceman_dmm.dm"
#include "code\_away_mission_tests.dm"
#include "code\_macros.dm"
#include "code\_macros_vr.dm"
@@ -89,7 +90,6 @@
#include "code\__defines\shields.dm"
#include "code\__defines\shuttle.dm"
#include "code\__defines\sound.dm"
#include "code\__defines\spaceman_dmm.dm"
#include "code\__defines\span_vr.dm"
#include "code\__defines\species_languages.dm"
#include "code\__defines\species_languages_vr.dm"