mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-09-09 19:51:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename ActionParam to ItemAction (#1069)

Browse Source 
* Rename `ActionParam` to `ItemParam`

* namefixer

* ItemAction

* merge issues

* merge

* fixes

* format

* renames

* format

* <= PLAYER_IA_MINUS1

* fixes

* more fixes

* e

* revew

* simple replace in namefixer

* fixes

* merge fixes

* merge fixes
This commit is contained in:
Anghelo Carvajal
2022-11-06 21:31:55 -03:00
committed by GitHub
parent a8c7a5bb89
commit 65cf949bc0
73 changed files with 548 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+5 -5
View File
@@ -1849,10 +1849,10 @@ s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState) {
// Actor_PickUpExchange? Seems to be called with exchangeItemId -1 if the same actor used Actor_PickUp
// This function is also used to toggle the "Speak" action on the A button
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerActionParam exchangeItemId) {
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerItemAction exchangeItemId) {
Player* player = GET_PLAYER(play);
if ((player->actor.flags & ACTOR_FLAG_100) || ((exchangeItemId > PLAYER_AP_NONE) && Player_InCsMode(play)) ||
if ((player->actor.flags & ACTOR_FLAG_100) || ((exchangeItemId > PLAYER_IA_NONE) && Player_InCsMode(play)) ||
(!actor->isTargeted &&
((fabsf(actor->playerHeightRel) > fabsf(yRange)) || (actor->xzDistToPlayer > player->talkActorDistance) ||
(xzRange < actor->xzDistToPlayer)))) {
@@ -1867,12 +1867,12 @@ s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, Player
return true;
}
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerActionParam exchangeItemId) {
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerItemAction exchangeItemId) {
return func_800B8500(actor, play, radius, radius, exchangeItemId);
}
s32 func_800B8614(Actor* actor, PlayState* play, f32 radius) {
return func_800B85E0(actor, play, radius, PLAYER_AP_NONE);
return func_800B85E0(actor, play, radius, PLAYER_IA_NONE);
}
s32 func_800B863C(Actor* actor, PlayState* play) {
@@ -1909,7 +1909,7 @@ s32 Actor_ChangeFocus(Actor* actor1, PlayState* play, Actor* actor2) {
return false;
}
PlayerActionParam Player_GetExchangeItemId(PlayState* play) {
PlayerItemAction Player_GetExchangeItemId(PlayState* play) {
Player* player = GET_PLAYER(play);
return player->exchangeItemId;