mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-13 06:58:03 -05:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-24 13:06:48 -04:00
parent ecd0e3e8bb
commit 821c7948d6
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
soh/soh/Enhancements/randomizer/draw.cpp
View File

@ -76,17 +76,13 @@ extern "C" void Randomizer_DrawBossKey(GlobalContext* globalCtx, GetItemEntry* g
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, (char*)__FILE__, __LINE__), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, (char*)__FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD); G_MTX_MODELVIEW | G_MTX_LOAD);
if (color_slot >= 0) { gsDPSetGrayscaleColor(POLY_XLU_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2],
gsDPSetGrayscaleColor(POLY_XLU_DISP++, colors[color_slot][0], colors[color_slot][1], colors[color_slot][2], 255);
255); gsSPGrayscale(POLY_XLU_DISP++, true);
gsSPGrayscale(POLY_XLU_DISP++, true);
}
gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL); gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiBossKeyGemDL);
if (color_slot >= 0) { gsSPGrayscale(POLY_XLU_DISP++, false);
gsSPGrayscale(POLY_XLU_DISP++, false);
}
CLOSE_DISPS(globalCtx->state.gfxCtx); CLOSE_DISPS(globalCtx->state.gfxCtx);
} }
@ -99,18 +95,14 @@ extern "C" void Randomizer_DrawDoubleDefense(GlobalContext* globalCtx, GetItemEn
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD);
// if (drawId == doubleDef) {
gsDPSetGrayscaleColor(POLY_XLU_DISP++, 255, 255, 255, 255); gsDPSetGrayscaleColor(POLY_XLU_DISP++, 255, 255, 255, 255);
gsSPGrayscale(POLY_XLU_DISP++, true); gsSPGrayscale(POLY_XLU_DISP++, true);
// }
gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiHeartBorderDL); gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiHeartBorderDL);
// if (drawId == doubleDef) {
gsSPGrayscale(POLY_XLU_DISP++, false); gsSPGrayscale(POLY_XLU_DISP++, false);
// }
gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiHeartContainerDL); gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiHeartContainerDL);
CLOSE_DISPS(globalCtx->state.gfxCtx); CLOSE_DISPS(globalCtx->state.gfxCtx);
} }

2
soh/soh/Enhancements/randomizer/draw.h
View File

@ -10,4 +10,4 @@ extern "C" void Randomizer_DrawSmallKey(GlobalContext* globalCtx, GetItemEntry*
extern "C" void Randomizer_DrawBossKey(GlobalContext* globalCtx, GetItemEntry* getItemEntry); extern "C" void Randomizer_DrawBossKey(GlobalContext* globalCtx, GetItemEntry* getItemEntry);
extern "C" void Randomizer_DrawDoubleDefense(GlobalContext* globalCtx, GetItemEntry getItemEntry); extern "C" void Randomizer_DrawDoubleDefense(GlobalContext* globalCtx, GetItemEntry getItemEntry);
#endif #endif