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

Use macros for oGfxCtx accesses (#465)

Browse source 
* fix colliderinit typo

* fix initchain

* reloc

* add defines

* add defines

* missed some on merge

* rename gfxCtx and add comment

* remove space
This commit is contained in:
fig02 2020-10-29 17:31:09 -04:00 • committed by GitHub
parent 92bb1fb210
commit 3c5fe66dcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
195 changed files with 2236 additions and 2229 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (globalCtx->sceneNum == SCENE_HIDAN) {
@ -165,8 +165,8 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) {
color = &defaultColor;
}
gDPSetEnvColor(oGfxCtx->polyOpa.p++, color->r, color->g, color->b, 255);
gSPDisplayList(oGfxCtx->polyOpa.p++, sDLists[thisx->params & 3]);
gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 255);
gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params & 3]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 399);
}