mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 23:10:22 +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

12
src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c
View file

@ -149,13 +149,11 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
Color_RGB8* color;
Color_RGB8 defaultColor;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 365);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 365);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369),
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (globalCtx->sceneNum == SCENE_HIDAN) {
@ -167,8 +165,8 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
color = &defaultColor;
}
gDPSetEnvColor(gfxCtx->polyOpa.p++, color->r, color->g, color->b, 255);
gSPDisplayList(gfxCtx->polyOpa.p++, sDLists[thisx->params & 3]);
gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 255);
gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[thisx->params & 3]);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 399);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 399);
}