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

Actually fix savegame crash... probably.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6987 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-09-29 01:54:52 +00:00
parent 6aeab6561d
commit dd1058c767
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/duke3d/src/savegame.cpp
View file

@ -1242,9 +1242,9 @@ static const dataspec_t svgm_script[] =
{ {
{ DS_STRING, (void *)svgm_script_string, 0, 1 }, { DS_STRING, (void *)svgm_script_string, 0, 1 },
{ DS_SAVEFN, (void *) &sv_preprojectilesave, 0, 1 }, { DS_SAVEFN, (void *) &sv_preprojectilesave, 0, 1 },
{ DS_NOCHK, &savegame_projectiles, sizeof(savegame_projectiles), 1 }, { DS_NOCHK, savegame_projectiles, sizeof(savegame_projectiles), 1 },
{ DS_LOADFN, (void *) &sv_preprojectileload, 0, 1 }, { DS_LOADFN, (void *) &sv_preprojectileload, 0, 1 },
{ DS_DYNAMIC|DS_CNT(savegame_projectilecnt), &savegame_projectiledata, sizeof(projectile_t), (intptr_t)&savegame_projectilecnt }, { DS_CNT(savegame_projectilecnt), savegame_projectiledata, sizeof(projectile_t), (intptr_t)&savegame_projectilecnt },
{ DS_SAVEFN, (void *) &sv_postprojectilesave, 0, 1 }, { DS_SAVEFN, (void *) &sv_postprojectilesave, 0, 1 },
{ DS_LOADFN, (void *) &sv_postprojectileload, 0, 1 }, { DS_LOADFN, (void *) &sv_postprojectileload, 0, 1 },
{ 0, &actor[0], sizeof(actor_t), MAXSPRITES }, { 0, &actor[0], sizeof(actor_t), MAXSPRITES },
@ -1849,17 +1849,16 @@ static void sv_quoteload()
static void sv_preprojectilesave() static void sv_preprojectilesave()
{ {
savegame_projectilecnt = 0; savegame_projectilecnt = 0;
Bmemset(savegame_projectiles, 0, sizeof(savegame_projectiles));
for (bssize_t i=0; i<MAXTILES; i++) for (native_t i=0; i<MAXTILES; i++)
if (g_tile[i].proj) if (g_tile[i].proj)
savegame_projectilecnt++; savegame_projectilecnt++;
if (savegame_projectiledata != NULL || savegame_projectilecnt > 0) if (savegame_projectilecnt > 0)
savegame_projectiledata = (projectile_t *) Xrealloc(savegame_projectiledata, sizeof(projectile_t) * savegame_projectilecnt); savegame_projectiledata = (projectile_t *) Xrealloc(savegame_projectiledata, sizeof(projectile_t) * savegame_projectilecnt);
int32_t cnt = 0; for (native_t i=0, cnt=0; i<MAXTILES; i++)
for (bssize_t i=0; i<MAXTILES; i++)
{ {
if (g_tile[i].proj) if (g_tile[i].proj)
{ {
@ -1871,28 +1870,26 @@ static void sv_preprojectilesave()
static void sv_postprojectilesave() static void sv_postprojectilesave()
{ {
// DO_FREE_AND_NULL(ProjectileData); DO_FREE_AND_NULL(savegame_projectiledata);
} }
static void sv_preprojectileload() static void sv_preprojectileload()
{ {
int32_t cnt = 0; savegame_projectilecnt = 0;
for (bssize_t i=0; i<MAXTILES; i++) for (native_t i=0; i<MAXTILES; i++)
{ {
if (savegame_projectiles[i>>3]&(1<<(i&7))) if (savegame_projectiles[i>>3]&(1<<(i&7)))
cnt++; savegame_projectilecnt++;
} }
if (savegame_projectiledata != NULL || cnt > 0) if (savegame_projectilecnt > 0)
savegame_projectiledata = (projectile_t *) Xrealloc(savegame_projectiledata, sizeof(projectile_t) * cnt); savegame_projectiledata = (projectile_t *) Xrealloc(savegame_projectiledata, sizeof(projectile_t) * savegame_projectilecnt);
} }
static void sv_postprojectileload() static void sv_postprojectileload()
{ {
int32_t cnt = 0; for (native_t i=0, cnt=0; i<MAXTILES; i++)
for (bssize_t i=0; i<MAXTILES; i++)
{ {
if (savegame_projectiles[i>>3]&(1<<(i&7))) if (savegame_projectiles[i>>3]&(1<<(i&7)))
{ {
@ -1900,7 +1897,8 @@ static void sv_postprojectileload()
Bmemcpy(g_tile[i].proj, &savegame_projectiledata[cnt++], sizeof(projectile_t)); Bmemcpy(g_tile[i].proj, &savegame_projectiledata[cnt++], sizeof(projectile_t));
} }
} }
// DO_FREE_AND_NULL(ProjectileData);
DO_FREE_AND_NULL(savegame_projectiledata);
} }
static void sv_prequoteredef() static void sv_prequoteredef()