Fix (still not enabled) undo/redo code compilation.

Also include one comment about a currently failing assertion there.

git-svn-id: https://svn.eduke32.com/eduke32@2482 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-14 22:31:32 +00:00
parent fbf0b9ea4f
commit 76de780d8b

View file

@ -460,7 +460,7 @@ void create_map_snapshot(void)
mapstate->numsectors = numsectors; mapstate->numsectors = numsectors;
mapstate->numwalls = numwalls; mapstate->numwalls = numwalls;
mapstate->numsprites = numsprites; mapstate->numsprites = Numsprites;
tempcrc = crc32once((uint8_t *)&sector[0],sizeof(sectortype) * numsectors); tempcrc = crc32once((uint8_t *)&sector[0],sizeof(sectortype) * numsectors);
@ -519,8 +519,9 @@ void create_map_snapshot(void)
else else
{ {
int32_t i = 0; int32_t i = 0;
spritetype *tspri = (spritetype *)Bcalloc(1, sizeof(spritetype) * Numsprites + 1), spritetype *tspri = (spritetype *)Bcalloc(1, sizeof(spritetype) * Numsprites + 1);
*spri = &tspri[0]; spritetype *spri = tspri;
mapstate->sprites = (spritetype *)Bcalloc(1, sizeof(spritetype) * Numsprites + QADDNSZ); mapstate->sprites = (spritetype *)Bcalloc(1, sizeof(spritetype) * Numsprites + QADDNSZ);
for (j=0; j<MAXSPRITES && i < Numsprites; j++) for (j=0; j<MAXSPRITES && i < Numsprites; j++)
@ -621,6 +622,8 @@ int32_t map_undoredo(int32_t dir)
insertsprite(sprite[i].sectnum,sprite[i].statnum); insertsprite(sprite[i].sectnum,sprite[i].statnum);
} }
// XXX: this fails currently! the decompressed sprites have
// .statnum==MAXSTATUS and .sectnum==MAXSECTORS. WTF?!
assert(Numsprites == mapstate->numsprites); assert(Numsprites == mapstate->numsprites);
#ifdef POLYMER #ifdef POLYMER