mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-08 00:44:42 +00:00
Code Issues Projects Releases Wiki Activity

Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)

Browse source
This commit is contained in:
Roman971 2020-08-30 01:00:17 +02:00 • committed by GitHub
parent 1f1b5e39f5
commit 2a2fdf7f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3133 additions and 3775 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/code/z_demo.c
View file

@ -1852,8 +1852,6 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
Gfx* displayList;
Gfx* prevDisplayList;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];
if (0) {} // Necessary to match
@ -1861,18 +1859,17 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) {
if (0) {} // Also necessary to match
if (BREG(0) != 0) {
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4101);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4101);
prevDisplayList = gfxCtx->polyOpa.p;
displayList = Graph_GfxPlusOne(gfxCtx->polyOpa.p);
gSPDisplayList(gfxCtx->overlay.p++, displayList);
prevDisplayList = oGfxCtx->polyOpa.p;
displayList = Graph_GfxPlusOne(oGfxCtx->polyOpa.p);
gSPDisplayList(oGfxCtx->overlay.p++, displayList);
Cutscene_DrawDebugInfo(globalCtx, &displayList, csCtx);
gSPEndDisplayList(displayList++);
Graph_BranchDlist(prevDisplayList, displayList);
gfxCtx->polyOpa.p = displayList;
oGfxCtx->polyOpa.p = displayList;
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4108);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4108);
}
csCtx->frames++;