zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 05:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: G_UnsnapshotLevel should abort with an error if it cannot read the savegame.

Browse source 
- fixed: The exception handler in G_DoLoadGame needs to rethrow the exception it receives.
This commit is contained in:
Christoph Oelckers 2016-10-05 19:02:53 +02:00
parent aeb5377821
commit 59d5b42abf
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.cpp
View file

@ -1999,7 +1999,7 @@ void G_DoLoadGame ()
{ {
// delete the resource file if anything goes wrong in here. // delete the resource file if anything goes wrong in here.
if (resfile != nullptr) delete resfile; if (resfile != nullptr) delete resfile;
return; throw;
} }
} }

6
src/g_level.cpp
View file

@ -1512,7 +1512,11 @@ void G_UnSnapshotLevel (bool hubLoad)
if (level.info->isValid()) if (level.info->isValid())
{ {
FSerializer arc; FSerializer arc;
if (!arc.OpenReader(&level.info->Snapshot)) return; if (!arc.OpenReader(&level.info->Snapshot))
{
I_Error("Failed to load savegame");
return;
}
G_SerializeLevel (arc, hubLoad); G_SerializeLevel (arc, hubLoad);
level.FromSnapshot = true; level.FromSnapshot = true;