Fixes the obvious thing

This commit is contained in:
Crazylemon64
2017-04-30 12:53:42 -07:00
parent 68df0319e2
commit 502e41b80d
3 changed files with 3 additions and 7 deletions
+1 -1
View File
@@ -23,7 +23,7 @@
#define DECLARE_GLOBAL_CONTROLLER(PROCESS,VARNAME) \
/datum/controller/process/##PROCESS/assertGlobality(){\
if(##VARNAME){\
message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller, '[##VARNAME]'.");\
message_admins("Controller '[name]' tried to become global but found another controller there already. Deleting the old controller.");\
qdel(##VARNAME);}\
##VARNAME = src;}\
\
+2 -3
View File
@@ -50,9 +50,6 @@ var/global/datum/controller/process/air_system/air_master
stat(null, "[last_active] active")
stat(null, "[last_excited] EG | [last_hpd] HPD | [last_asc] ASC | [last_hotspots] Hot")
/datum/controller/process/air_system/copyStateFrom()
air_master = src
DECLARE_GLOBAL_CONTROLLER(air_system, air_master)
/datum/controller/process/air_system/proc/process_hotspots()
@@ -152,3 +149,5 @@ DECLARE_GLOBAL_CONTROLLER(air_system, air_master)
icemaster.icon_state = "snowfloor"
icemaster.layer = TURF_LAYER+0.1
icemaster.mouse_opacity = 0
DECLARE_GLOBAL_CONTROLLER(air_system, air_master)
-3
View File
@@ -8,8 +8,6 @@ var/global/datum/controller/process/mob/mob_master
schedule_interval = 20 // every 2 seconds
start_delay = 16
log_startup_progress("Mob ticker starting up.")
if(mob_master)
qdel(mob_master) //only one mob master
mob_master = src
/datum/controller/process/mob/started()
@@ -35,5 +33,4 @@ var/global/datum/controller/process/mob/mob_master
mob_list -= M
current_cycle++
DECLARE_GLOBAL_CONTROLLER(mob, mob_master)