mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-16 01:31:30 +00:00
Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef
This commit is contained in:
commit
0c4f3cbeca
1 changed files with 3 additions and 3 deletions
|
@ -877,7 +877,7 @@ static void P_NetUnArchiveWorld(void)
|
||||||
if (diff3 & SD_COLORMAP)
|
if (diff3 & SD_COLORMAP)
|
||||||
{
|
{
|
||||||
extracolormap_t *exc;
|
extracolormap_t *exc;
|
||||||
size_t dbg_i = 0;
|
//size_t dbg_i = 0;
|
||||||
|
|
||||||
UINT8 fadestart = READUINT8(get),
|
UINT8 fadestart = READUINT8(get),
|
||||||
fadeend = READUINT8(get),
|
fadeend = READUINT8(get),
|
||||||
|
@ -926,7 +926,7 @@ static void P_NetUnArchiveWorld(void)
|
||||||
#ifdef EXTRACOLORMAPLUMPS
|
#ifdef EXTRACOLORMAPLUMPS
|
||||||
if (exc->lump != LUMPERROR)
|
if (exc->lump != LUMPERROR)
|
||||||
{
|
{
|
||||||
dbg_i++;
|
//dbg_i++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -940,7 +940,7 @@ static void P_NetUnArchiveWorld(void)
|
||||||
// dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
|
// dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
dbg_i++;
|
//dbg_i++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!exc)
|
if (!exc)
|
||||||
|
|
Loading…
Reference in a new issue