Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up NPC player interaction usages #1458

Merged
merged 7 commits into from
Dec 19, 2022
Merged

Clean up NPC player interaction usages #1458

merged 7 commits into from
Dec 19, 2022

Conversation

luryus
Copy link
Contributor

@luryus luryus commented Dec 10, 2022

Went through all the usages of the Npc interaction system documented in #1426 and renamed related variables and functions.

  • Renamed all functions used as the UpdateTalkState callback to <npcname>_UpdateTalkState
  • Renamed all functions used as the GetTextId callback to <npcname>_GetTextId
    • Some actors (Saria, Malon, Mido, ...) seem to modify their state in these functions. Imo it's still clearer to just use the same GetTextId name even if the function is not a pure getter
  • Renamed and cleaned up custom versions of the 'Npc_UpdateTalkingfunction inEnGoandEnKz` (not really documented yet)
  • Renamed local variables and actor struct fields that are used with the NPC interaction system
  • Fixed RutoLimb enum in z_en_ru1.h having values offset by one

Dragorn421
Dragorn421 reviewed Dec 10, 2022
View reviewed changes
src/overlays/actors/ovl_En_Go/z_en_go.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Kz/z_en_kz.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Md/z_en_md.c Outdated Show resolved Hide resolved
hensldm
hensldm reviewed Dec 11, 2022
View reviewed changes
src/overlays/actors/ovl_En_Go2/z_en_go2.c Show resolved Hide resolved
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c Outdated Show resolved Hide resolved
Dragorn421
Dragorn421 reviewed Dec 11, 2022
View reviewed changes
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c Outdated Show resolved Hide resolved
src/overlays/actors/ovl_En_In/z_en_in.c Outdated Show resolved Hide resolved
@fig02 fig02 merged commit 2ae6468 into zeldaret:master Dec 19, 2022
louist103 pushed a commit to louist103/oot that referenced this pull request Jan 3, 2023
@luryus @louist103
Clean up NPC player interaction usages (zeldaret#1458)
06c3414 
* Clean up player tracking related things in NPCs

* Cleanup Npc_UpdateTalking usages and related things

* Reformat

* Minor fixes based on review comments

* Remove unneeded declarations

* More consistent function names
@engineer124 engineer124 mentioned this pull request Feb 27, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dragorn421 Dragorn421 Dragorn421 approved these changes

@fig02 fig02 fig02 approved these changes

@hensldm hensldm hensldm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@luryus @Dragorn421 @fig02 @hensldm