summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-11-20 13:33:08 -0500
committerGitHub <noreply@github.com>2025-11-20 13:33:08 -0500
commitb5fed649cd8e7bc0e268ea4fedbfc92ab6ccfa31 (patch)
tree67f7b6693dadc6f8650f0810df0b12cbf6a81a83 /mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
parenteec21ccddd8b65ff9eca67a32c0d33a8f0c881c5 (diff)
Convert mundane shuffles to ObjectExtension (#1297)
* Convert pot shuffle to ActorExtension * Convert crate shuffle to ActorExtension * Convert barrel shuffle to ActorExtension * Use ObjectExtension for mundane checks * Convert grass to ObjectExtension Add two missed grass checks in Woods of Mystery * Convert cows to ObjectExtension * Fix cow relocations * Convert freestandings to ObjectExtension * Convert remaining snowballs to use ActorListIndex * Wrong ID for one snowball * Apply feedback, document how identification works
Diffstat (limited to 'mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp')
-rw-r--r--mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp b/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
index 465d6f132..4689fc867 100644
--- a/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
+++ b/mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp
@@ -30,13 +30,13 @@ void MiscVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_list opti
}
}
-RandoCheckId Rando::ActorBehavior::GetActorRandoCheckId(Actor* actor) {
- const ActorRandoCheckId* actorRandoCheckId = ObjectExtension::GetInstance().Get<ActorRandoCheckId>(actor);
+RandoCheckId Rando::ActorBehavior::GetObjectRandoCheckId(void* object) {
+ const ActorRandoCheckId* actorRandoCheckId = ObjectExtension::GetInstance().Get<ActorRandoCheckId>(object);
return actorRandoCheckId != nullptr ? actorRandoCheckId->randoCheckId : RC_UNKNOWN;
}
-void Rando::ActorBehavior::SetActorRandoCheckId(const Actor* actor, RandoCheckId rc) {
- ObjectExtension::GetInstance().Set<ActorRandoCheckId>(actor, ActorRandoCheckId{ rc });
+void Rando::ActorBehavior::SetObjectRandoCheckId(const void* object, RandoCheckId rc) {
+ ObjectExtension::GetInstance().Set<ActorRandoCheckId>(object, ActorRandoCheckId{ rc });
}
// Entry point for the module, run once on game boot