mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
d8359c5a39
* Fixes Callback Trait Addition/Removal Oversight (#80009) ## About The Pull Request This pissed me off working yesterday, traits are supposed to work on the `/datum` level, not just the `/atom` level. Let's fix that, while also cleaning up the code a bunch to make it look better and have error logging for unwanted cases. ## Changelog Nothing that concerns players. * Fixes Callback Trait Addition/Removal Oversight --------- Co-authored-by: san7890 <the@san7890.com>
46 lines
2.0 KiB
Plaintext
46 lines
2.0 KiB
Plaintext
#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitAdd), ##target, ##trait, ##source)
|
|
#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitRemove), ##target, ##trait, ##source)
|
|
|
|
///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback.
|
|
/proc/___TraitAdd(target, trait, source)
|
|
if(!target || !trait || !source)
|
|
return
|
|
|
|
if(islist(target))
|
|
for(var/datum/listed_target in target)
|
|
ADD_TRAIT(listed_target, trait, source)
|
|
return
|
|
|
|
ASSERT(isdatum(target), "Invalid target used in TRAIT_CALLBACK_ADD! Expected a datum reference, got [target] instead.")
|
|
|
|
var/datum/datum_target = target
|
|
ADD_TRAIT(datum_target, trait, source)
|
|
|
|
///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback.
|
|
/proc/___TraitRemove(target, trait, source)
|
|
if(!target || !trait || !source)
|
|
return
|
|
|
|
if(islist(target))
|
|
for(var/datum/listed_target in target)
|
|
REMOVE_TRAIT(listed_target, trait, source)
|
|
return
|
|
|
|
ASSERT(isdatum(target), "Invalid target used in TRAIT_CALLBACK_REMOVE! Expected a datum reference, got [target] instead.")
|
|
|
|
var/datum/datum_target = target
|
|
REMOVE_TRAIT(datum_target, trait, source)
|
|
|
|
|
|
/// Proc that handles adding multiple traits to a target via a list. Must have a common source and target.
|
|
/datum/proc/add_traits(list/list_of_traits, source)
|
|
ASSERT(islist(list_of_traits), "Invalid arguments passed to add_traits! Invoked on [src] with [list_of_traits], source being [source].")
|
|
for(var/trait in list_of_traits)
|
|
ADD_TRAIT(src, trait, source)
|
|
|
|
/// Proc that handles removing multiple traits from a target via a list. Must have a common source and target.
|
|
/datum/proc/remove_traits(list/list_of_traits, source)
|
|
ASSERT(islist(list_of_traits), "Invalid arguments passed to remove_traits! Invoked on [src] with [list_of_traits], source being [source].")
|
|
for(var/trait in list_of_traits)
|
|
REMOVE_TRAIT(src, trait, source)
|