lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/p_saveg.c
View File

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