From 23482e88fa5e8e955f4a5c73b5215a71cb592286 Mon Sep 17 00:00:00 2001 From: Leshana Date: Wed, 1 Apr 2020 20:36:00 -0400 Subject: [PATCH] Moves topic return value defines to where they are usable everywhere. --- code/__defines/misc.dm | 7 +++++++ code/modules/client/preference_setup/preference_setup.dm | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index c63b1fb54d..a555c5ac33 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -129,6 +129,13 @@ //Area flags, possibly more to come #define RAD_SHIELDED 1 //shielded from radiation, clearly +// OnTopic return values +#define TOPIC_NOACTION 0 +#define TOPIC_HANDLED 1 +#define TOPIC_REFRESH 2 +#define TOPIC_UPDATE_PREVIEW 4 +#define TOPIC_REFRESH_UPDATE_PREVIEW (TOPIC_REFRESH|TOPIC_UPDATE_PREVIEW) + // Convoluted setup so defines can be supplied by Bay12 main server compile script. // Should still work fine for people jamming the icons into their repo. #ifndef CUSTOM_ITEM_OBJ diff --git a/code/modules/client/preference_setup/preference_setup.dm b/code/modules/client/preference_setup/preference_setup.dm index a55ca0ccca..01a0d75fec 100644 --- a/code/modules/client/preference_setup/preference_setup.dm +++ b/code/modules/client/preference_setup/preference_setup.dm @@ -1,9 +1,3 @@ -#define TOPIC_NOACTION 0 -#define TOPIC_HANDLED 1 -#define TOPIC_REFRESH 2 -#define TOPIC_UPDATE_PREVIEW 4 -#define TOPIC_REFRESH_UPDATE_PREVIEW (TOPIC_REFRESH|TOPIC_UPDATE_PREVIEW) - #define PREF_FBP_CYBORG "cyborg" #define PREF_FBP_POSI "posi" #define PREF_FBP_SOFTWARE "software"