Merge pull request #4236 from Citadel-Station-13/upstream-merge-33274

[MIRROR] Removes ComponentActivated in favor of callbacks
2017-12-06 03:53:35 +00:00
parent 424ed12d89 989102f552
commit c1cd970cc4
14 changed files with 79 additions and 151 deletions
@@ -142,10 +142,6 @@
 /datum/component/proc/OnTransfer(datum/new_parent)
 	return

-/datum/component/proc/AfterComponentActivated()
-	set waitfor = FALSE
-	return
-
 /datum/component/proc/_GetInverseTypeList(our_type = type)
 	#if DM_VERSION >= 513
 	#warning 512 is definitely stable now, remove the old code
@@ -176,28 +172,16 @@
 		var/datum/callback/CB = C.signal_procs[sigtype]
 		if(!CB)
 			return NONE
-		. = CB.InvokeAsync(arglist(arguments))
-		if(. & COMPONENT_ACTIVATED)
-			ComponentActivated(C)
-			C.AfterComponentActivated()
-	else
-		. = NONE
-		for(var/I in target)
-			var/datum/component/C = I
-			if(!C.enabled)
-				continue
-			var/datum/callback/CB = C.signal_procs[sigtype]
-			if(!CB)
-				continue
-			var/retval = CB.InvokeAsync(arglist(arguments))
-			. |= retval
-			if(retval & COMPONENT_ACTIVATED)
-				ComponentActivated(C)
-				C.AfterComponentActivated()
-
-/datum/proc/ComponentActivated(datum/component/C)
-	set waitfor = FALSE
-	return
+		return CB.InvokeAsync(arglist(arguments))
+	. = NONE
+	for(var/I in target)
+		var/datum/component/C = I
+		if(!C.enabled)
+			continue
+		var/datum/callback/CB = C.signal_procs[sigtype]
+		if(!CB)
+			continue
+		. |= CB.InvokeAsync(arglist(arguments))

 /datum/proc/GetComponent(c_type)
 	var/list/dc = datum_components
@@ -3,10 +3,12 @@
 	var/list/archdrops
 	var/prob2drop
 	var/dug
+	var/datum/callback/callback

-/datum/component/archaeology/Initialize(_prob2drop, list/_archdrops = list())
+/datum/component/archaeology/Initialize(_prob2drop, list/_archdrops = list(), datum/callback/_callback)
 	prob2drop = Clamp(_prob2drop, 0, 100)
 	archdrops = _archdrops
+	callback = _callback
 	RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/Dig)
 	RegisterSignal(COMSIG_ATOM_EX_ACT, .proc/BombDig)
 	RegisterSignal(COMSIG_ATOM_SING_PULL, .proc/SingDig)
@@ -67,6 +69,8 @@
 			if(OT.slowdown) //Things like snow slow you down until you dig them.
 				OT.slowdown = 0
 	dug = TRUE
+	if(callback)
+		callback.Invoke()

 /datum/component/archaeology/proc/SingDig(S, current_size)
 	switch(current_size)
@@ -9,5 +9,4 @@
 	var/mob/living/carbon/victim = AM
 	if(istype(victim))
 		for(var/datum/disease/D in diseases)
-			victim.ContactContractDisease(D, "feet")
-		return COMPONENT_ACTIVATED
+			victim.ContactContractDisease(D, "feet")
@@ -16,20 +16,19 @@
 	var/list/materials
 	var/show_on_examine
 	var/list/allowed_typecache
-	var/last_inserted_type
 	var/last_inserted_id
-	var/last_amount_inserted
-	var/last_insert_success
 	var/precise_insertion = FALSE
 	var/datum/callback/precondition
+	var/datum/callback/after_insert

-/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition)
+/datum/component/material_container/Initialize(list/mat_list, max_amt = 0, _show_on_examine = FALSE, list/allowed_types, datum/callback/_precondition, datum/callback/_after_insert)
 	materials = list()
 	max_amount = max(0, max_amt)
 	show_on_examine = _show_on_examine
 	if(allowed_types)
 		allowed_typecache = typecacheof(allowed_types)
 	precondition = _precondition
+	after_insert = _after_insert

 	RegisterSignal(COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
 	RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/OnExamine)
@@ -57,8 +56,7 @@
 	if((I.flags_2 & (HOLOGRAM_2 | NO_MAT_REDEMPTION_2)) || (tc && !is_type_in_typecache(I, tc)))
 		to_chat(user, "<span class='warning'>[parent] won't accept [I]!</span>")
 		return
-	. = COMPONENT_ACTIVATED | COMPONENT_NO_AFTERATTACK
-	last_insert_success = FALSE
+	. = COMPONENT_NO_AFTERATTACK
 	var/datum/callback/pc = precondition
 	if(pc && !pc.Invoke())
 		return
@@ -69,11 +67,12 @@
 	if(!has_space(material_amount))
 		to_chat(user, "<span class='warning'>[parent] is full. Please remove metal or glass from [parent] in order to insert more.</span>")
 		return
-	INVOKE_ASYNC(src, .proc/user_insert, I, user)
+	user_insert(I, user)

 /datum/component/material_container/proc/user_insert(obj/item/I, mob/living/user)
 	var/requested_amount
-	if(istype(I, /obj/item/stack) && precise_insertion)
+	var/Itype = I.type
+	if(ispath(Itype, /obj/item/stack) && precise_insertion)
 		var/atom/current_parent = parent
 		requested_amount = input(user, "How much do you want to insert?", "Inserting sheets") as num|null
 		if(isnull(requested_amount) || (requested_amount <= 0))
@@ -85,7 +84,6 @@
 		return
 	var/inserted = insert_item(I, stack_amt = requested_amount)
 	if(inserted)
-		last_insert_success = TRUE
 		if(istype(I, /obj/item/stack))
 			to_chat(user, "<span class='notice'>You insert [inserted] sheet[inserted>1 ? "s" : ""] into [parent].</span>")
 			if(!QDELETED(I))
@@ -93,6 +91,8 @@
 		else
 			to_chat(user, "<span class='notice'>You insert a material total of [inserted] into [parent].</span>")
 			qdel(I)
+		if(after_insert)
+			after_insert.Invoke(Itype, last_inserted_id, inserted)
 	else
 		user.put_in_active_hand(I)

@@ -132,9 +132,7 @@
 		return FALSE

 	last_inserted_id = insert_materials(S,amt)
-	last_inserted_type = S.type
 	S.use(amt)
-	last_amount_inserted = amt
 	return amt

 /datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1, stack_amt)
@@ -148,8 +146,6 @@
 		return FALSE

 	last_inserted_id = insert_materials(I, multiplier)
-	last_inserted_type = I.type
-	last_amount_inserted = material_amount
 	return material_amount

 /datum/component/material_container/proc/insert_materials(obj/item/I, multiplier = 1) //for internal usage only
@@ -1,18 +1,15 @@
 /datum/component/slippery
 	var/intensity
 	var/lube_flags
-	var/mob/slip_victim
+	var/datum/callback/callback

-/datum/component/slippery/Initialize(_intensity, _lube_flags = NONE)
+/datum/component/slippery/Initialize(_intensity, _lube_flags = NONE, datum/callback/_callback)
 	intensity = max(_intensity, 0)
 	lube_flags = _lube_flags
+	callback = _callback
 	RegisterSignal(list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Slip)

 /datum/component/slippery/proc/Slip(atom/movable/AM)
 	var/mob/victim = AM
-	if(istype(victim) && !victim.is_flying() && victim.slip(intensity, parent, lube_flags))
-		slip_victim = victim
-		return COMPONENT_ACTIVATED
-
-/datum/component/slippery/AfterComponentActivated()
-	slip_victim = null
+	if(istype(victim) && !victim.is_flying() && victim.slip(intensity, parent, lube_flags) && callback)
+		callback.Invoke(victim)