diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-06-25 15:13:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 15:13:31 -0400 |
| commit | d8f2e9abc67163a366fa2e62ac5d2d7467dfdb65 (patch) | |
| tree | 12af46e3178cf5f7fa7836e6e213f57f12b7aeaf /src/code/z_play.c | |
| parent | 2ce4742bf69faebb16ea1710c4d4e7902b1be0f1 (diff) | |
Move `PlayState` to a new `z64play.h` (#1966)
* ActorContext
* frameadvance
* SfxSource
* GameOverContext
* RoomContext
* TransitionActorContext
* fix bss
* Move PlayState
* Move play functions to new header
* SAC_ENABLE
* no longer needed
* SAC_ENABLE again
* z_demo being silly
* comment
* format headers
* fix retail bss
* actually fix bss
* Cutscene_ProcessScript comment
* bss again
* Update src/code/z_demo.c
Co-authored-by: cadmic <cadmic24@gmail.com>
* rename to frame_advance and remove it from z64.h
* move macros too
* review
* Rename SequenceContext to SceneSequences
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Diffstat (limited to 'src/code/z_play.c')
| -rw-r--r-- | src/code/z_play.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/code/z_play.c b/src/code/z_play.c index 589ea596c..e763cd9e0 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -2,6 +2,8 @@ #include "quake.h" #include "terminal.h" +#include "z64frame_advance.h" + #if OOT_DEBUG void* gDebugCutsceneScript = NULL; UNK_TYPE D_8012D1F4 = 0; // unused @@ -451,8 +453,8 @@ void Play_Init(GameState* thisx) { Interface_SetSceneRestrictions(this); Environment_PlaySceneSequence(this); - gSaveContext.seqId = this->sequenceCtx.seqId; - gSaveContext.natureAmbienceId = this->sequenceCtx.natureAmbienceId; + gSaveContext.seqId = this->sceneSequences.seqId; + gSaveContext.natureAmbienceId = this->sceneSequences.natureAmbienceId; func_8002DF18(this, GET_PLAYER(this)); AnimTaskQueue_Update(this, &this->animTaskQueue); gSaveContext.respawnFlag = 0; |