Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
This commit is contained in:
commit
4ac97eb77b
|
@ -317,12 +317,13 @@ static void D_Display(void)
|
|||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
|
||||
F_WipeEndScreen();
|
||||
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
|
||||
}
|
||||
|
||||
if (wipegamestate == GS_LEVEL && rendermode != render_none)
|
||||
{
|
||||
V_SetPaletteLump("PLAYPAL"); // Reset the palette
|
||||
R_ReInitColormaps(0);
|
||||
}
|
||||
}
|
||||
|
||||
F_WipeStartScreen();
|
||||
}
|
||||
|
|
|
@ -3225,7 +3225,7 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean dontadd, boolean ignoreb
|
|||
|
||||
if (!ignorebuffer)
|
||||
{
|
||||
for (bufx = 0; bufx < NUMMAPS; bufx++)
|
||||
for (bufx = 0; bufx < (maphell ? 3 : NUMMAPS); bufx++)
|
||||
{
|
||||
if (randmapbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue