stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-31 23:00:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sonicitems' into encore

Browse source 
# Conflicts:
#	src/d_main.c
This commit is contained in:
toaster 2018-08-11 22:37:17 +01:00
commit 6fa0605416
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_main.c
View file

@ -317,12 +317,13 @@ static void D_Display(void)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
F_WipeEndScreen(); F_WipeEndScreen();
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
}
if (wipegamestate == GS_LEVEL && rendermode != render_none) if (wipegamestate == GS_LEVEL && rendermode != render_none)
{ {
V_SetPaletteLump("PLAYPAL"); // Reset the palette V_SetPaletteLump("PLAYPAL"); // Reset the palette
R_ReInitColormaps(0, LUMPERROR); R_ReInitColormaps(0, LUMPERROR);
} }
}
F_WipeStartScreen(); F_WipeStartScreen();
} }

2
src/g_game.c
View file

@ -3229,7 +3229,7 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean dontadd, boolean ignoreb
if (!ignorebuffer) 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 if (randmapbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
break; break;