[MIRROR] replace XMOUSE_* with their correct alternatives (#2327)

Co-authored-by: Spookerton <[email protected]> Co-authored-by: UEDCommander <[email protected]>
SierraBay · Jun 30, 2024 · 2685351 · 2685351
1 parent c3b5f98
commit 2685351
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -30,7 +30,6 @@
 #include "code\__defines\antagonists.dm"
 #include "code\__defines\ao.dm"
 #include "code\__defines\ao_misc.dm"
-#include "code\__defines\appearance.dm"
 #include "code\__defines\armor.dm"
 #include "code\__defines\atmos.dm"
 #include "code\__defines\atmospherics.dm"

diff --git a/code/__defines/__renderer.dm b/code/__defines/__renderer.dm
@@ -207,6 +207,11 @@
 /mutable_appearance/appearance_flags = DEFAULT_APPEARANCE_FLAGS // Inherits /image but re docs, subject to change
 
 
+// Consider these images/atoms as part of the UI/HUD
+#define APPEARANCE_UI (RESET_COLOR | RESET_TRANSFORM | NO_CLIENT_COLOR)
+#define APPEARANCE_UI_IGNORE_ALPHA (APPEARANCE_UI | RESET_ALPHA)
+
+
 /image/proc/plating_decal_layerise()
 	plane = DEFAULT_PLANE
 	layer = DECAL_PLATING_LAYER

diff --git a/code/__defines/appearance.dm b/code/__defines/appearance.dm
diff --git a/code/controllers/subsystems/typing.dm b/code/controllers/subsystems/typing.dm
@@ -172,7 +172,7 @@ SUBSYSTEM_DEF(typing)
 	icon_state = "typing"
 	plane = EFFECTS_ABOVE_LIGHTING_PLANE
 	layer = SPEECH_INDICATOR_LAYER
-	mouse_opacity = XMOUSE_OPACITY_NEVER
+	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 	simulated = FALSE
 	anchored = TRUE
 

diff --git a/code/game/objects/structures/ironing_board.dm b/code/game/objects/structures/ironing_board.dm
@@ -105,11 +105,11 @@
 	..()
 	if (buckled_mob)
 		set_density(TRUE)
-		mouse_opacity = XMOUSE_OPACITY_ALWAYS
+		mouse_opacity = MOUSE_OPACITY_PRIORITY
 		deployed = TRUE
 	else
 		set_density(FALSE)
-		mouse_opacity = XMOUSE_OPACITY_DEFAULT
+		mouse_opacity = MOUSE_OPACITY_NORMAL
 		deployed = FALSE
 	update_icon()
 

diff --git a/code/game/objects/structures/roller_bed.dm b/code/game/objects/structures/roller_bed.dm
@@ -127,11 +127,11 @@
 	. = ..()
 	if (target == buckled_mob)
 		set_density(TRUE)
-		mouse_opacity = XMOUSE_OPACITY_ALWAYS
+		mouse_opacity = MOUSE_OPACITY_PRIORITY
 		update_icon()
 	else
 		set_density(FALSE)
-		mouse_opacity = XMOUSE_OPACITY_DEFAULT
+		mouse_opacity = MOUSE_OPACITY_NORMAL
 		if (drip_active)
 			RipDrip()
 		update_icon()