diff options
| author | fig02 <fig02srl@gmail.com> | 2022-10-16 18:00:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-16 18:00:18 -0400 |
| commit | 26d6028ff1808204aa2978c6c0fe79e5cea9f2bd (patch) | |
| tree | 5a95186925117732ae4fdb512ec17552f63e6f27 /src/code/z_actor.c | |
| parent | bea53e1cc390d66b52a28720f5d88db0e887a467 (diff) | |
Rename scene lists (#1344)
* first pass
* revert unwanted zap change
* review
* name Actor_InitContext, change arg name
* change bzero to use type
Diffstat (limited to 'src/code/z_actor.c')
| -rw-r--r-- | src/code/z_actor.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index e1f939029..e81004620 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -1953,15 +1953,14 @@ void Actor_DisableLens(PlayState* play) { } } -// Actor_InitContext -void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry) { +void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* playerEntry) { ActorOverlay* overlayEntry; SavedSceneFlags* savedSceneFlags; s32 i; savedSceneFlags = &gSaveContext.sceneFlags[play->sceneId]; - bzero(actorCtx, sizeof(*actorCtx)); + bzero(actorCtx, sizeof(ActorContext)); ActorOverlayTable_Init(); Matrix_MtxFCopy(&play->billboardMtxF, &gMtxFClear); @@ -1983,7 +1982,7 @@ void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEnt actorCtx->absoluteSpace = NULL; - Actor_SpawnEntry(actorCtx, actorEntry, play); + Actor_SpawnEntry(actorCtx, playerEntry, play); func_8002C0C0(&actorCtx->targetCtx, actorCtx->actorLists[ACTORCAT_PLAYER].head, play); func_8002FA60(play); } @@ -2024,12 +2023,12 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { sp74 = NULL; unkFlag = 0; - if (play->numSetupActors != 0) { - actorEntry = &play->setupActorList[0]; - for (i = 0; i < play->numSetupActors; i++) { + if (play->numActorEntries != 0) { + actorEntry = &play->actorEntryList[0]; + for (i = 0; i < play->numActorEntries; i++) { Actor_SpawnEntry(&play->actorCtx, actorEntry++, play); } - play->numSetupActors = 0; + play->numActorEntries = 0; } if (actorCtx->unk_02 != 0) { |