zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 06:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better bad save checking

Browse source 
- Move invalid save condition checks from save CCMD into G_SaveGame().
- Add a gamestate != GS_LEVEL check to G_DoSaveGame().
This commit is contained in:
Randy Heit 2015-02-24 20:18:41 -06:00
parent c7842a8de8
commit 5d65b10aec
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/c_cmds.cpp
View file

@ -813,21 +813,6 @@ CCMD (save)
Printf ("usage: save <filename> [description]\n");
return;
}
if (!usergame)
{
Printf ("not in a saveable game\n");
return;
}
if (gamestate != GS_LEVEL)
{
Printf ("not in a level\n");
return;
}
if(players[consoleplayer].health <= 0 && !multiplayer)
{
Printf ("player is dead in a single-player game\n");
return;
}
FString fname = argv[1];
DefaultExtension (fname, ".zds");
G_SaveGame (fname, argv.argc() > 2 ? argv[2] : argv[1]);

25
src/g_game.cpp
View file

@ -1983,10 +1983,25 @@ void G_SaveGame (const char *filename, const char *description)
Printf ("A game save is still pending.\n");
return;
}
savegamefile = filename;
strncpy (savedescription, description, sizeof(savedescription)-1);
savedescription[sizeof(savedescription)-1] = '\0';
sendsave = true;
else if (!usergame)
{
Printf ("not in a saveable game\n");
}
else if (gamestate != GS_LEVEL)
{
Printf ("not in a level\n");
}
else if (players[consoleplayer].health <= 0 && !multiplayer)
{
Printf ("player is dead in a single-player game\n");
}
else
{
savegamefile = filename;
strncpy (savedescription, description, sizeof(savedescription)-1);
savedescription[sizeof(savedescription)-1] = '\0';
sendsave = true;
}
}
FString G_BuildSaveName (const char *prefix, int slot)
@ -2138,7 +2153,7 @@ void G_DoSaveGame (bool okForQuicksave, FString filename, const char *descriptio
// Do not even try, if we're not in a level. (Can happen after
// a demo finishes playback.)
if (lines == NULL || sectors == NULL)
if (lines == NULL || sectors == NULL || gamestate != GS_LEVEL)
{
return;
}