github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-25 23:55:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add user data to the switch actor.

Browse source
This commit is contained in:
Caturria 2023-08-31 00:00:31 -04:00
commit ac935dad18
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
View file

@ -37,6 +37,12 @@ typedef struct
int framesUntilChime; int framesUntilChime;
}AudioCompassData; }AudioCompassData;
typedef struct
{
int framesUntilAboveChime;
}SwitchData;
// Begin actor-specific policy callbacks. // Begin actor-specific policy callbacks.
void accessible_en_ishi(AccessibleActor* actor) { void accessible_en_ishi(AccessibleActor* actor) {
@ -175,8 +181,25 @@ void accessible_hasi(AccessibleActor* actor) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_PL_DAMAGE, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_PL_DAMAGE, false);
} }
} }
void accessible_switch(AccessibleActor* actor) { bool accessible_switch_init(AccessibleActor* actor) {
SwitchData* data = (SwitchData*)malloc(sizeof(SwitchData));
data->framesUntilAboveChime = 0;
if (data == NULL)
return false;//failure to allocate memory.
actor->userData = (void*) data;
return true;
}
void accessible_switch_cleanup(AccessibleActor* actor)
{
free(actor->userData);
}
void accessible_switch(AccessibleActor * actor) {
SwitchData* data = (SwitchData*)actor->userData;
Player* player = GET_PLAYER(actor->play); Player* player = GET_PLAYER(actor->play);
ObjSwitch* sw = (ObjSwitch*)actor->actor; ObjSwitch* sw = (ObjSwitch*)actor->actor;
Vec3f& scale = actor->actor->scale; Vec3f& scale = actor->actor->scale;
@ -552,6 +575,8 @@ void accessible_audio_compass(AccessibleActor* actor) {
policy.pitch = 1.1; policy.pitch = 1.1;
ActorAccessibility_AddSupportedActor(ACTOR_DOOR_SHUTTER, policy); ActorAccessibility_AddSupportedActor(ACTOR_DOOR_SHUTTER, policy);
ActorAccessibility_InitPolicy(&policy, "Switch", accessible_switch, 0); ActorAccessibility_InitPolicy(&policy, "Switch", accessible_switch, 0);
policy.cleanupUserData = accessible_switch_cleanup;
policy.initUserData = accessible_switch_init;
policy.n = 1; policy.n = 1;
policy.ydist = 200; policy.ydist = 200;
policy.pitch = 1.1; policy.pitch = 1.1;