mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 06:12:20 -05:00
Code Issues Projects Releases Wiki Activity

CrowdControl random buttons fix (#4679)

Browse Source 
* CC random buttons fix

* Archez's fix
This commit is contained in:
aMannus 2024-12-14 22:31:29 +01:00 committed by GitHub
parent 4b07a6f59a
commit 3a8ba03ce8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/game-interactor/GameInteractionEffect.h
View File

@ -217,7 +217,7 @@ namespace GameInteractionEffect {
void _Apply() override; void _Apply() override;
}; };
class PressRandomButton: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect { class PressRandomButton: public RemovableGameInteractionEffect, public ParameterizedGameInteractionEffect {
GameInteractionEffectQueryResult CanBeApplied() override; GameInteractionEffectQueryResult CanBeApplied() override;
void _Apply() override; void _Apply() override;
}; };

3
soh/soh/Enhancements/randomizer/ShufflePots.cpp
View File

@ -54,7 +54,8 @@ void ObjTsubo_RandomizerSpawnCollectible(ObjTsubo* potActor, PlayState* play) {
void ObjTsubo_RandomizerInit(void* actorRef) { void ObjTsubo_RandomizerInit(void* actorRef) {
Actor* actor = static_cast<Actor*>(actorRef); Actor* actor = static_cast<Actor*>(actorRef);
if (actor->id != ACTOR_OBJ_TSUBO) return; // Check for Lake Hylia specifically because the game spawns 2 pots out of bounds there for some reason.
if (actor->id != ACTOR_OBJ_TSUBO || gPlayState->sceneNum == SCENE_LAKE_HYLIA) return;
ObjTsubo* potActor = static_cast<ObjTsubo*>(actorRef); ObjTsubo* potActor = static_cast<ObjTsubo*>(actorRef);