Savegame fixes

This commit is contained in:
mazmazz 2018-09-10 21:12:56 -04:00
parent 3da38f2a9b
commit 22746c1d91
1 changed files with 12 additions and 10 deletions

View File

@ -877,7 +877,7 @@ static void P_NetUnArchiveWorld(void)
if (diff3 & SD_COLORMAP)
{
extracolormap_t *exc;
size_t dbg_i = 0;
//size_t dbg_i = 0;
UINT8 fadestart = READUINT8(get),
fadeend = READUINT8(get),
@ -926,7 +926,7 @@ static void P_NetUnArchiveWorld(void)
#ifdef EXTRACOLORMAPLUMPS
if (exc->lump != LUMPERROR)
{
dbg_i++;
//dbg_i++;
continue;
}
#endif
@ -936,17 +936,17 @@ static void P_NetUnArchiveWorld(void)
&& fadeend == exc->fadeend
&& fog == exc->fog)
{
CONS_Debug(DBG_RENDER, "P_NetUnArchiveWorld: Found map %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n",
dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
// CONS_Debug(DBG_RENDER, "P_NetUnArchiveWorld: Found map %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n",
// dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
break;
}
dbg_i++;
//dbg_i++;
}
if (!exc)
{
CONS_Debug(DBG_RENDER, "P_NetUnArchiveWorld: Creating map %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n",
dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
// CONS_Debug(DBG_RENDER, "P_NetUnArchiveWorld: Creating map %d: rgba(%d,%d,%d,%d) fadergba(%d,%d,%d,%d)\n",
// dbg_i, cr, cg, cb, ca, cfr, cfg, cfb, cfa);
exc = Z_Calloc(sizeof (*exc), PU_LEVEL, NULL);
@ -971,14 +971,16 @@ static void P_NetUnArchiveWorld(void)
R_AddColormapToList(exc);
sectors[i].extra_colormap = exc;
#ifdef EXTRACOLORMAPLUMPS
exc->lump = LUMPERROR;
exc->lumpname[0] = 0;
} // if (!exc) // if (!lumpname[0] || !R_ColormapForName(lumpname))
#endif
}
sectors[i].extra_colormap = exc;
#ifdef EXTRACOLORMAPLUMPS
}
#endif
}
if (diff & SD_FFLOORS)