mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-03 01:53:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move player-related function declarations to z64player.h (#1480)

Browse Source 
* Move player function declarations to z64player.h

* rename Actor_MountHorse to Player_MountHorse and similar functions

* whoops

* add missing includes

* format

* whoops
This commit is contained in:
Anghelo Carvajal
2023-11-21 12:13:29 -03:00
committed by GitHub
parent 76f81833b6
commit 2b4610670f
9 changed files with 134 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+4 -4
View File
@@ -1377,7 +1377,7 @@ bool func_800B715C(PlayState* play) {
return player->stateFlags2 & PLAYER_STATE2_8;
}
void Actor_SetCameraHorseSetting(PlayState* play, Player* player) {
void Player_SetCameraHorseSetting(PlayState* play, Player* player) {
if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_4) && (player->actor.id == ACTOR_PLAYER)) {
EnHorse* rideActor = (EnHorse*)player->rideActor;
@@ -1387,7 +1387,7 @@ void Actor_SetCameraHorseSetting(PlayState* play, Player* player) {
}
}
void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) {
void Player_MountHorse(PlayState* play, Player* player, Actor* horse) {
player->rideActor = horse;
player->stateFlags1 |= PLAYER_STATE1_800000;
horse->child = &player->actor;
@@ -1398,7 +1398,7 @@ bool func_800B7200(Player* player) {
(player->csAction != PLAYER_CSACTION_NONE);
}
void Actor_SpawnHorse(PlayState* play, Player* player) {
void Player_SpawnHorse(PlayState* play, Player* player) {
Horse_Spawn(play, player);
}
@@ -2445,7 +2445,7 @@ void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* acto
Target_Init(&actorCtx->targetCtx, actorCtx->actorLists[ACTORCAT_PLAYER].first, play);
Actor_InitHalfDaysBit(actorCtx);
Fault_AddClient(&sActorFaultClient, (void*)Actor_PrintLists, actorCtx, NULL);
Actor_SpawnHorse(play, (Player*)actorCtx->actorLists[ACTORCAT_PLAYER].first);
Player_SpawnHorse(play, (Player*)actorCtx->actorLists[ACTORCAT_PLAYER].first);
}
/**