Merge branch 'vanilia-savegame-fix' into 'master'

Fix saving game progress on a unmodified game

See merge request STJr/SRB2!433
This commit is contained in:
Monster Iestyn 2018-12-26 16:05:16 -05:00
commit e39c6b47e7

View file

@ -2630,7 +2630,7 @@ static boolean P_CanSave(void)
{ {
// Saving is completely ignored under these conditions: // Saving is completely ignored under these conditions:
if ((cursaveslot < 0) // Playing without saving if ((cursaveslot < 0) // Playing without saving
|| (!modifiedgame || savemoddata) // Game is modified || (modifiedgame && !savemoddata) // Game is modified
|| (netgame || multiplayer) // Not in single-player || (netgame || multiplayer) // Not in single-player
|| (demoplayback || demorecording || metalrecording) // Currently in demo || (demoplayback || demorecording || metalrecording) // Currently in demo
|| (players[consoleplayer].lives <= 0) // Completely dead || (players[consoleplayer].lives <= 0) // Completely dead