thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'colormap-overhaul-change-ldef' into colormap-overhaul-fade

Browse source
This commit is contained in:
mazmazz 2018-09-17 00:28:16 -04:00
commit 02c33bcac8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p_saveg.c
View file

@ -606,9 +606,10 @@ static void P_NetUnArchiveColormaps(void)
// dummy colormaps. Now that we are loading the color data, // dummy colormaps. Now that we are loading the color data,
// set up the dummies. // set up the dummies.
extracolormap_t *exc, *existing_exc, *exc_next = NULL; extracolormap_t *exc, *existing_exc, *exc_next = NULL;
num_net_colormaps = READUINT32(save_p);
UINT32 i = 0; UINT32 i = 0;
num_net_colormaps = READUINT32(save_p);
for (exc = net_colormaps; i < num_net_colormaps; i++, exc = exc_next) for (exc = net_colormaps; i < num_net_colormaps; i++, exc = exc_next)
{ {
UINT8 fadestart, fadeend, fog; UINT8 fadestart, fadeend, fog;
@ -739,9 +740,6 @@ static void P_NetArchiveWorld(void)
const side_t *si; const side_t *si;
UINT8 *put; UINT8 *put;
// initialize colormap vars because paranoia
ClearNetColormaps();
// reload the map just to see difference // reload the map just to see difference
mapsector_t *ms; mapsector_t *ms;
mapsidedef_t *msd; mapsidedef_t *msd;
@ -749,6 +747,9 @@ static void P_NetArchiveWorld(void)
const sector_t *ss = sectors; const sector_t *ss = sectors;
UINT8 diff, diff2, diff3; UINT8 diff, diff2, diff3;
// initialize colormap vars because paranoia
ClearNetColormaps();
WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD); WRITEUINT32(save_p, ARCHIVEBLOCK_WORLD);
put = save_p; put = save_p;