Skip to content

Commit 64553b3

Browse files
committed
bugfixes and optimizations
1 parent 976771c commit 64553b3

File tree

9 files changed

+210
-231
lines changed

9 files changed

+210
-231
lines changed

decompile/General/ElimBG/ElimBG_5_HandleState.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ void DECOMP_ElimBG_HandleState(struct GameTracker *gGT)
4848
// if this is the first frame of pause
4949
if (sdata->pause_state == 1)
5050
{
51-
// allow rendering of checkered flag, add rendering of RenderBucket,
52-
// so that Adv Pause instances can render, after non-pause instances are disabled
53-
gGT->renderFlags &= 0x1000;
54-
gGT->renderFlags |= 0x20;
51+
// optimization, already know & 0x1000
52+
// is removed as prerequisite for ElimBG_Activate
53+
gGT->renderFlags = 0x20;
5554

5655
gGT->hudFlags &= 0xf6;
5756

decompile/General/ElimBG/ElimBG_6_Deactivate.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ void DECOMP_ElimBG_Deactivate(struct GameTracker *gGT)
44
{
55
//it's written this way for bytebudget reasons.
66
u_char backup = (u_char)sdata->pause_backup_hudFlags;
7+
8+
// if game is paused
79
if (sdata->pause_state != 0)
8-
{ //if game is not paused
9-
sdata->pause_state = 3; //this is the last frame of pause
10-
gGT->renderFlags = gGT->renderFlags & 0x1000 | (sdata->pause_backup_renderFlags & 0xffffefff);
10+
{
11+
// if game is not paused
12+
sdata->pause_state = 3;
13+
14+
gGT->renderFlags =
15+
(gGT->renderFlags & 0x1000) |
16+
(sdata->pause_backup_renderFlags & 0xffffefff);
17+
1118
gGT->hudFlags = backup;
1219
}
1320
}

decompile/General/LOAD/LOAD_10_HubCallback.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ void DECOMP_LOAD_HubCallback(struct LoadQueueSlot* lqs)
44
{
55
DECOMP_LOAD_Callback_PatchMem();
66

7-
struct GameTracker* gGT = sdata->gGT;
8-
gGT->level2 = sdata->ptrLevelFile;
7+
struct GameTracker* gGT = sdata->gGT;
8+
struct Level* lev = sdata->ptrLevelFile;
9+
10+
gGT->level2 = lev;
11+
gGT->visMem2 = lev->visMem;
912
}

decompile/General/LOAD/LOAD_38_Hub_SwapNow.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ void DECOMP_LOAD_Hub_SwapNow()
7878
DECOMP_DecalGlobal_Store(gGT, (struct Icon*)level1->levTexLookup); //2nd param might be `level1->levTexLookup->firstIcon`
7979
}
8080

81-
#ifndef REBUILD_PS1
82-
MainInit_VisMem(gGT);
83-
#endif
84-
8581
cDC = &gGT->cameraDC[0];
8682
cDC->ptrQuadBlock = 0;
8783
cDC->visLeafSrc = 0;

0 commit comments

Comments
 (0)