Savegame fixes

This commit is contained in:
mazmazz 2018-09-10 21:12:56 -04:00
parent 7eed10f563
commit 0c74c5c017
2 changed files with 9 additions and 10 deletions

View file

@ -655,8 +655,6 @@ static void P_NetArchiveWorld(void)
WRITEINT32(put, ss->firsttag); WRITEINT32(put, ss->firsttag);
WRITEINT32(put, ss->nexttag); WRITEINT32(put, ss->nexttag);
} }
if (diff3 & SD_MIDMAP)
WRITEINT32(put, ss->midmap);
if (diff3 & SD_COLORMAP) if (diff3 & SD_COLORMAP)
{ {
@ -938,8 +936,8 @@ 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++;
@ -947,8 +945,8 @@ static void P_NetUnArchiveWorld(void)
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);
@ -973,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)

View file

@ -393,7 +393,6 @@ typedef struct sector_s
// these are saved for netgames, so do not let Lua touch these! // these are saved for netgames, so do not let Lua touch these!
INT32 spawn_nexttag, spawn_firsttag; // the actual nexttag/firsttag values may differ if the sector's tag was changed INT32 spawn_nexttag, spawn_firsttag; // the actual nexttag/firsttag values may differ if the sector's tag was changed
INT32 spawn_bottommap, spawn_midmap, spawn_topmap;
// offsets sector spawned with (via linedef type 7) // offsets sector spawned with (via linedef type 7)
fixed_t spawn_flr_xoffs, spawn_flr_yoffs; fixed_t spawn_flr_xoffs, spawn_flr_yoffs;