zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

When loading a game, DON'T restore 'adult' TV tiles. This fixes the recent

Browse source 
crashes.

Usually, after loading a game, some wall tiles are tweaked depending on whether
adult mode is enabled or not.  If it's not, those wall picnums are replaced
with blank or broken screens.  If it is, they are restored from the wall's
.extra member.  Apparently though, Mapster32 leaves some .extra members
floating around even after deleting a TROR nextwall link (it's used as the
'lower wall index').  Because MAXWALLS is greater than MAXTILES, this may
produce out-of-bounds accesses and corrupt memory (besides setting wall
tilenums to nonsensical values) later in the game.

Other than that, the change only affects loading savegames created with adult
mode OFF. Kinky TV screenies simply won't be restored then.

git-svn-id: https://svn.eduke32.com/eduke32@2235 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-01-05 20:48:37 +00:00
parent b5f2955895
commit 146e1f1c09
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/eduke32/source/gameexec.c
View file

@ -5266,13 +5266,7 @@ void G_RestoreMapState(mapstate_t *save)
screenpeek = myconnectindex; screenpeek = myconnectindex;
if (ud.lockout == 0) if (ud.lockout)
{
for (x=g_numAnimWalls-1; x>=0; x--)
if (wall[animwall[x].wallnum].extra >= 0)
wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra;
}
else
{ {
for (x=g_numAnimWalls-1; x>=0; x--) for (x=g_numAnimWalls-1; x>=0; x--)
switch (DynamicTileMap[wall[animwall[x].wallnum].picnum]) switch (DynamicTileMap[wall[animwall[x].wallnum].picnum])
@ -5286,6 +5280,14 @@ void G_RestoreMapState(mapstate_t *save)
break; break;
} }
} }
#if 0
else
{
for (x=g_numAnimWalls-1; x>=0; x--)
if (wall[animwall[x].wallnum].extra >= 0)
wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra;
}
#endif
G_ResetInterpolations(); G_ResetInterpolations();

6
polymer/eduke32/source/menus.c
View file

@ -1395,14 +1395,14 @@ void M_DisplayMenus(void)
{ {
ud.lockout = 0; ud.lockout = 0;
buf[0] = 0; buf[0] = 0;
#if 0
for (x=0; x<g_numAnimWalls; x++) for (x=0; x<g_numAnimWalls; x++)
if (wall[animwall[x].wallnum].picnum != W_SCREENBREAK && if (wall[animwall[x].wallnum].picnum != W_SCREENBREAK &&
wall[animwall[x].wallnum].picnum != W_SCREENBREAK+1 && wall[animwall[x].wallnum].picnum != W_SCREENBREAK+1 &&
wall[animwall[x].wallnum].picnum != W_SCREENBREAK+2) wall[animwall[x].wallnum].picnum != W_SCREENBREAK+2)
if (wall[animwall[x].wallnum].extra >= 0) if (wall[animwall[x].wallnum].extra >= 0)
wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra; wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra;
#endif
} }
g_currentMenu = 10000; g_currentMenu = 10000;
KB_ClearKeyDown(sc_Enter); KB_ClearKeyDown(sc_Enter);
@ -1419,12 +1419,14 @@ void M_DisplayMenus(void)
if (ud.pwlockout[0] == 0) if (ud.pwlockout[0] == 0)
{ {
ud.lockout = 0; ud.lockout = 0;
#if 0
for (x=0; x<g_numAnimWalls; x++) for (x=0; x<g_numAnimWalls; x++)
if (wall[animwall[x].wallnum].picnum != W_SCREENBREAK && if (wall[animwall[x].wallnum].picnum != W_SCREENBREAK &&
wall[animwall[x].wallnum].picnum != W_SCREENBREAK+1 && wall[animwall[x].wallnum].picnum != W_SCREENBREAK+1 &&
wall[animwall[x].wallnum].picnum != W_SCREENBREAK+2) wall[animwall[x].wallnum].picnum != W_SCREENBREAK+2)
if (wall[animwall[x].wallnum].extra >= 0) if (wall[animwall[x].wallnum].extra >= 0)
wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra; wall[animwall[x].wallnum].picnum = wall[animwall[x].wallnum].extra;
#endif
} }
else else
{ {

16
polymer/eduke32/source/savegame.c
View file

@ -2620,13 +2620,7 @@ static void postloadplayer(int32_t savegamep)
//4 //4
if (savegamep) if (savegamep)
{ {
if (ud.lockout == 0) if (ud.lockout)
{
for (i=0; i<g_numAnimWalls; i++)
if (wall[animwall[i].wallnum].extra >= 0)
wall[animwall[i].wallnum].picnum = wall[animwall[i].wallnum].extra;
}
else
{ {
for (i=0; i<g_numAnimWalls; i++) for (i=0; i<g_numAnimWalls; i++)
switch (DynamicTileMap[wall[animwall[i].wallnum].picnum]) switch (DynamicTileMap[wall[animwall[i].wallnum].picnum])
@ -2640,6 +2634,14 @@ static void postloadplayer(int32_t savegamep)
break; break;
} }
} }
#if 0
else
{
for (i=0; i<g_numAnimWalls; i++)
if (wall[animwall[i].wallnum].extra >= 0)
wall[animwall[i].wallnum].picnum = wall[animwall[i].wallnum].extra;
}
#endif
} }
//5 //5