stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-23 12:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Savegame fixes

Browse source
This commit is contained in:
mazmazz 2018-09-10 21:12:56 -04:00
parent 75267dfa2c
commit c007dfacec
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/p_saveg.c
View file

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

1
src/r_defs.h
View file

@ -393,7 +393,6 @@ typedef struct sector_s
// 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_bottommap, spawn_midmap, spawn_topmap;
// offsets sector spawned with (via linedef type 7)
fixed_t spawn_flr_xoffs, spawn_flr_yoffs;