Merge pull request #34630 from Spookerton/spkrtn/cng/glob-radial-menu

GLOBify radial menu
Baystation12 · May 28, 2024 · b5854f2 · b5854f2
2 parents 113ad85 + 4407570
commit b5854f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
@@ -1,18 +1,15 @@
-#define NEXT_PAGE_ID "__next__"
-#define DEFAULT_CHECK_DELAY 20
-
-var/global/list/radial_menus = list()
-
-/obj/screen/radial/Destroy()
-	parent = null
-	return ..()
+GLOBAL_LIST_EMPTY(radial_menus)
 
 /obj/screen/radial
 	icon = 'icons/screen/radial.dmi'
 	layer = HUD_ABOVE_ITEM_LAYER
 	plane = HUD_PLANE
 	var/datum/radial_menu/parent
 
+/obj/screen/radial/Destroy()
+	parent = null
+	return ..()
+
 /obj/screen/radial/slice
 	icon_state = "radial_slice"
 	var/choice
@@ -55,6 +52,9 @@ var/global/list/radial_menus = list()
 		parent.finished = TRUE
 
 /datum/radial_menu
+	var/const/NEXT_PAGE_ID = "__next__"
+	var/const/DEFAULT_CHECK_DELAY = 2 SECONDS
+
 	var/list/choices = list() //List of choice id's
 	var/list/choices_icons = list() //choice_id -> icon
 	var/list/choices_values = list() //choice_id -> choice
@@ -316,14 +316,14 @@ var/global/list/radial_menus = list()
 		for(var/atom/thing in check_locs)
 			check_locs[thing] = thing.loc
 
-	if(global.radial_menus[uniqueid])
+	if(GLOB.radial_menus[uniqueid])
 		if(!no_repeat_close)
-			var/datum/radial_menu/menu = global.radial_menus[uniqueid]
+			var/datum/radial_menu/menu = GLOB.radial_menus[uniqueid]
 			menu.finished = TRUE
 		return
 
 	var/datum/radial_menu/menu = new
-	global.radial_menus[uniqueid] = menu
+	GLOB.radial_menus[uniqueid] = menu
 	if(radius)
 		menu.radius = radius
 	if(istype(custom_check))
@@ -335,7 +335,7 @@ var/global/list/radial_menus = list()
 	menu.wait(user, anchor, require_near, check_locs)
 	var/answer = menu.selected_choice
 	qdel(menu)
-	global.radial_menus -= uniqueid
+	GLOB.radial_menus -= uniqueid
 	return answer
 
 #define RADIAL_INPUT(user, choices) show_radial_menu(user, user, choices)

diff --git a/code/_onclick/hud/radial_persistent.dm b/code/_onclick/hud/radial_persistent.dm
@@ -37,7 +37,7 @@
 
 /datum/radial_menu/persistent/Destroy()
 	QDEL_NULL(select_proc_callback)
-	global.radial_menus -= uniqueid
+	GLOB.radial_menus -= uniqueid
 	Reset()
 	hide()
 	return ..()
@@ -55,12 +55,12 @@
 	if(!uniqueid)
 		uniqueid = "defmenu_\ref[user]_\ref[anchor]"
 
-	if(global.radial_menus[uniqueid])
+	if(GLOB.radial_menus[uniqueid])
 		return
 
 	var/datum/radial_menu/persistent/menu = new
 	menu.uniqueid = uniqueid
-	global.radial_menus[uniqueid] = menu
+	GLOB.radial_menus[uniqueid] = menu
 	if(radius)
 		menu.radius = radius
 	menu.select_proc_callback = select_proc