mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
Match more code files (#1724)
This commit is contained in:
parent
be4f3142e0
commit
bc9c1f2be2
4 changed files with 12 additions and 6 deletions
|
@ -105,7 +105,7 @@ void AudioMgr_ThreadEntry(void* arg) {
|
||||||
IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->interruptQueue);
|
IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->interruptQueue);
|
||||||
|
|
||||||
// Spin waiting for events
|
// Spin waiting for events
|
||||||
while (true) {
|
for (;;) {
|
||||||
osRecvMesg(&audioMgr->interruptQueue, (OSMesg*)&msg, OS_MESG_BLOCK);
|
osRecvMesg(&audioMgr->interruptQueue, (OSMesg*)&msg, OS_MESG_BLOCK);
|
||||||
|
|
||||||
switch (*msg) {
|
switch (*msg) {
|
||||||
|
|
|
@ -162,6 +162,8 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov
|
||||||
|
|
||||||
OPEN_DISPS(play->state.gfxCtx, "../z_fcurve_data_skelanime.c", 279);
|
OPEN_DISPS(play->state.gfxCtx, "../z_fcurve_data_skelanime.c", 279);
|
||||||
|
|
||||||
|
if (1) {}
|
||||||
|
|
||||||
Matrix_Push();
|
Matrix_Push();
|
||||||
|
|
||||||
if ((overrideLimbDraw == NULL) ||
|
if ((overrideLimbDraw == NULL) ||
|
||||||
|
|
|
@ -118,8 +118,8 @@ void MapMark_DrawForDungeon(PlayState* play) {
|
||||||
markInfo->textureWidth, markInfo->textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
markInfo->textureWidth, markInfo->textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
||||||
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
||||||
|
|
||||||
rectLeft = (GREG(94) + markPoint->x + 204) << 2;
|
rectLeft = ((OOT_DEBUG ? GREG(94) : 0) + markPoint->x + 204) << 2;
|
||||||
rectTop = (GREG(95) + markPoint->y + 140) << 2;
|
rectTop = ((OOT_DEBUG ? GREG(95) : 0) + markPoint->y + 140) << 2;
|
||||||
gSPTextureRectangle(OVERLAY_DISP++, rectLeft, rectTop, markInfo->rectWidth + rectLeft,
|
gSPTextureRectangle(OVERLAY_DISP++, rectLeft, rectTop, markInfo->rectWidth + rectLeft,
|
||||||
rectTop + markInfo->rectHeight, G_TX_RENDERTILE, 0, 0, markInfo->dsdx,
|
rectTop + markInfo->rectHeight, G_TX_RENDERTILE, 0, 0, markInfo->dsdx,
|
||||||
markInfo->dtdy);
|
markInfo->dtdy);
|
||||||
|
|
|
@ -47,14 +47,18 @@ extern u16 D_0E000000[];
|
||||||
void VisZBuf_Init(VisZBuf* this) {
|
void VisZBuf_Init(VisZBuf* this) {
|
||||||
this->vis.type = VIS_ZBUF_TYPE_IA;
|
this->vis.type = VIS_ZBUF_TYPE_IA;
|
||||||
this->vis.scissorType = VIS_NO_SETSCISSOR;
|
this->vis.scissorType = VIS_NO_SETSCISSOR;
|
||||||
|
|
||||||
this->vis.primColor.r = 255;
|
this->vis.primColor.r = 255;
|
||||||
this->vis.primColor.g = 255;
|
this->vis.primColor.g = 255;
|
||||||
this->vis.primColor.b = 255;
|
this->vis.primColor.b = 255;
|
||||||
this->vis.primColor.a = 255;
|
this->vis.primColor.a = 255;
|
||||||
|
|
||||||
|
// clang-format off
|
||||||
|
this->vis.envColor.r = 0; \
|
||||||
|
this->vis.envColor.g = 0; \
|
||||||
|
this->vis.envColor.b = 0; \
|
||||||
this->vis.envColor.a = 255;
|
this->vis.envColor.a = 255;
|
||||||
this->vis.envColor.r = 0;
|
// clang-format on
|
||||||
this->vis.envColor.g = 0;
|
|
||||||
this->vis.envColor.b = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void VisZBuf_Destroy(VisZBuf* this) {
|
void VisZBuf_Destroy(VisZBuf* this) {
|
||||||
|
|
Loading…
Reference in a new issue