Updates to tgstation commit 78e471d

2018-07-05 01:22:27 -04:00
parent ac6fddcfb3
commit 3e18d8208e
107 changed files with 1054 additions and 1013 deletions
@@ -13,31 +13,21 @@
 	var/requires_mob_riding = TRUE			//whether this only works if the attacker is riding a mob, rather than anything they can buckle to.
 	var/requires_mount = TRUE				//kinda defeats the point of jousting if you're not mounted but whatever.
 	var/mob/current_holder
-	var/datum/component/redirect/listener
 	var/current_timerid

 /datum/component/jousting/Initialize()
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(COMSIG_ITEM_EQUIPPED, .proc/on_equip)
-	RegisterSignal(COMSIG_ITEM_DROPPED, .proc/on_drop)
-	RegisterSignal(COMSIG_ITEM_ATTACK, .proc/on_attack)
-
-/datum/component/jousting/Destroy()
-	QDEL_NULL(listener)
-	return ..()
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+	RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)

 /datum/component/jousting/proc/on_equip(mob/user, slot)
+	RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE)
 	current_holder = user
-	if(!listener)
-		listener = user.AddComponent(/datum/component/redirect, COMSIG_MOVABLE_MOVED, CALLBACK(src, .proc/mob_move))
-	else
-		user.TakeComponent(listener)
-		if(QDELING(listener))
-			listener = null

 /datum/component/jousting/proc/on_drop(mob/user)
-	QDEL_NULL(listener)
+	UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
 	current_holder = null
 	current_direction = NONE
 	current_tile_charge = 0