zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-06 07:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups to handling of old save versions

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6528 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-12-01 06:19:04 +00:00
parent ee0524bc23
commit f808648079
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,13 +165,14 @@ void ReadSaveGameHeaders(void)
if (k) if (k)
{ {
// old version, signal to menu code // old version, signal to menu code
if (k==2 || k==3) if (k > 0)
g_oldverSavegame[i] = 1; g_oldverSavegame[i] = 1;
// else h.savename is all zeros (fatal failure, like wrong header // else h.savename is all zeros (fatal failure, like wrong header
// magic or too short header) // magic or too short header)
} }
Bmemcpy(ud.savegame[i], h.savename, sizeof(ud.savegame[i])); if (k >= 0)
Bmemcpy(ud.savegame[i], h.savename, sizeof(ud.savegame[i]));
kclose(fil); kclose(fil);
} }
@ -192,7 +193,7 @@ int32_t G_LoadSaveHeaderNew(int32_t spot, savehead_t *saveh)
return -1; return -1;
i = sv_loadheader(fil, spot, saveh); i = sv_loadheader(fil, spot, saveh);
if (i && (i != 2 && i != 3)) if (i < 0)
goto corrupt; goto corrupt;
if (kread(fil, &screenshotofs, 4) != 4) if (kread(fil, &screenshotofs, 4) != 4)
@ -248,9 +249,9 @@ int32_t G_LoadPlayer(int32_t spot)
ready2send = 0; ready2send = 0;
i = sv_loadheader(fil, spot, &h); i = sv_loadheader(fil, spot, &h);
if ((i && i != 2) || h.numplayers != ud.multimode) if ((i < 0) || h.numplayers != ud.multimode)
{ {
if (i == 2 || i == 3) if (i == -4 || i == -3 || i == 1)
P_DoQuote(QUOTE_SAVE_BAD_VERSION, g_player[myconnectindex].ps); P_DoQuote(QUOTE_SAVE_BAD_VERSION, g_player[myconnectindex].ps);
else if (h.numplayers!=ud.multimode) else if (h.numplayers!=ud.multimode)
P_DoQuote(QUOTE_SAVE_BAD_PLAYERS, g_player[myconnectindex].ps); P_DoQuote(QUOTE_SAVE_BAD_PLAYERS, g_player[myconnectindex].ps);
@ -1435,7 +1436,7 @@ int32_t sv_loadheader(int32_t fil, int32_t spot, savehead_t *h)
OSD_Printf("%s %d header reads \"%s\", expected \"EDuke32SAVE\".\n", OSD_Printf("%s %d header reads \"%s\", expected \"EDuke32SAVE\".\n",
havedemo ? "Demo":"Savegame", havedemo ? -spot : spot, h->headerstr); havedemo ? "Demo":"Savegame", havedemo ? -spot : spot, h->headerstr);
Bmemset(h->headerstr, 0, sizeof(h->headerstr)); Bmemset(h->headerstr, 0, sizeof(h->headerstr));
return 1; return -2;
} }
if (h->majorver != SV_MAJOR_VER || h->minorver != SV_MINOR_VER || h->bytever != BYTEVERSION) if (h->majorver != SV_MAJOR_VER || h->minorver != SV_MINOR_VER || h->bytever != BYTEVERSION)
@ -1444,7 +1445,16 @@ int32_t sv_loadheader(int32_t fil, int32_t spot, savehead_t *h)
OSD_Printf("Incompatible demo version. Expected %d.%d.%d, found %d.%d.%d\n", OSD_Printf("Incompatible demo version. Expected %d.%d.%d, found %d.%d.%d\n",
SV_MAJOR_VER, SV_MINOR_VER, BYTEVERSION, SV_MAJOR_VER, SV_MINOR_VER, BYTEVERSION,
h->majorver, h->minorver, h->bytever); h->majorver, h->minorver, h->bytever);
return 2;
if (h->majorver == SV_MAJOR_VER && h->minorver == SV_MINOR_VER)
{
return 1;
}
else
{
Bmemset(h->headerstr, 0, sizeof(h->headerstr));
return -3;
}
} }
if (h->ptrsize != sizeof(intptr_t)) if (h->ptrsize != sizeof(intptr_t))
@ -1452,7 +1462,9 @@ int32_t sv_loadheader(int32_t fil, int32_t spot, savehead_t *h)
if (havedemo) if (havedemo)
OSD_Printf("Demo incompatible. Expected pointer size %d, found %d\n", OSD_Printf("Demo incompatible. Expected pointer size %d, found %d\n",
(int32_t)sizeof(intptr_t), h->ptrsize); (int32_t)sizeof(intptr_t), h->ptrsize);
return 3;
Bmemset(h->headerstr, 0, sizeof(h->headerstr));
return -4;
} }
return 0; return 0;