From 80d429338b533864aaa0215ccbc401476fad0bdb Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 12 Jun 2022 22:56:43 -0500 Subject: [PATCH] Change hardcoded defines to use bitflags (#67722) --- code/__DEFINES/plumbing.dm | 10 +++++----- code/__DEFINES/power.dm | 6 +++--- code/__DEFINES/turfs.dm | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/__DEFINES/plumbing.dm b/code/__DEFINES/plumbing.dm index 320bbe8258f..39277fb1f73 100644 --- a/code/__DEFINES/plumbing.dm +++ b/code/__DEFINES/plumbing.dm @@ -1,8 +1,8 @@ -#define FIRST_DUCT_LAYER 1 -#define SECOND_DUCT_LAYER 2 -#define THIRD_DUCT_LAYER 4 -#define FOURTH_DUCT_LAYER 8 -#define FIFTH_DUCT_LAYER 16 +#define FIRST_DUCT_LAYER (1<<0) +#define SECOND_DUCT_LAYER (1<<1) +#define THIRD_DUCT_LAYER (1<<2) +#define FOURTH_DUCT_LAYER (1<<3) +#define FIFTH_DUCT_LAYER (1<<4) #define DUCT_LAYER_DEFAULT THIRD_DUCT_LAYER diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index ec8888c43a0..ff298ca9f39 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -1,6 +1,6 @@ -#define CABLE_LAYER_1 1 -#define CABLE_LAYER_2 2 -#define CABLE_LAYER_3 4 +#define CABLE_LAYER_1 (1<<0) +#define CABLE_LAYER_2 (1<<1) +#define CABLE_LAYER_3 (1<<2) #define MACHINERY_LAYER_1 1 diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 16267e3b258..1af08fc90a9 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -1,9 +1,9 @@ -#define CHANGETURF_DEFER_CHANGE 1 -#define CHANGETURF_IGNORE_AIR 2 // This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air -#define CHANGETURF_FORCEOP 4 -#define CHANGETURF_SKIP 8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE -#define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR -#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing. +#define CHANGETURF_DEFER_CHANGE (1<<0) +#define CHANGETURF_IGNORE_AIR (1<<1) // This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air +#define CHANGETURF_FORCEOP (1<<2) +#define CHANGETURF_SKIP (1<<3) // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE +#define CHANGETURF_INHERIT_AIR (1<<4) // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR +#define CHANGETURF_RECALC_ADJACENT (1<<5) //Immediately recalc adjacent atmos turfs instead of queuing. #define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS)