From b5fed649cd8e7bc0e268ea4fedbfc92ab6ccfa31 Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Thu, 20 Nov 2025 13:33:08 -0500 Subject: 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 --- mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mm/2s2h/Rando/ActorBehavior/ActorBehavior.cpp') 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(actor); +RandoCheckId Rando::ActorBehavior::GetObjectRandoCheckId(void* object) { + const ActorRandoCheckId* actorRandoCheckId = ObjectExtension::GetInstance().Get(object); return actorRandoCheckId != nullptr ? actorRandoCheckId->randoCheckId : RC_UNKNOWN; } -void Rando::ActorBehavior::SetActorRandoCheckId(const Actor* actor, RandoCheckId rc) { - ObjectExtension::GetInstance().Set(actor, ActorRandoCheckId{ rc }); +void Rando::ActorBehavior::SetObjectRandoCheckId(const void* object, RandoCheckId rc) { + ObjectExtension::GetInstance().Set(object, ActorRandoCheckId{ rc }); } // Entry point for the module, run once on game boot -- cgit v1.2.3