Skip to content
Permalink
Browse files

- added checks for the special hacky quicksave marker.

  • Loading branch information...
coelckers committed Aug 11, 2019
1 parent a53861e commit 6cc94347885a4338c955adafcc088d0c42093cb1
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/menu/loadsavemenu.cpp
  2. +2 −2 src/menu/messagebox.cpp
@@ -342,7 +342,7 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,
node->bMissingWads = false;
if (okForQuicksave)
{
if (quickSaveSlot == nullptr || forceQuicksave) quickSaveSlot = node;
if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
LastAccessed = LastSaved = i;
}
return;
@@ -358,7 +358,7 @@ void FSavegameManager::NotifyNewSave(const FString &file, const FString &title,

if (okForQuicksave)
{
if (quickSaveSlot == nullptr || forceQuicksave) quickSaveSlot = node;
if (quickSaveSlot == nullptr || quickSaveSlot == (FSaveGameNode*)1 || forceQuicksave) quickSaveSlot = node;
LastAccessed = LastSaved = index;
}
}
@@ -183,7 +183,7 @@ CCMD (quicksave)
return;
}

if (savegameManager.quickSaveSlot == NULL)
if (savegameManager.quickSaveSlot == NULL || savegameManager.quickSaveSlot == (FSaveGameNode*)1)
{
S_Sound(CHAN_VOICE | CHAN_UI, "menu/activate", snd_menuvolume, ATTN_NONE);
M_StartControlPanel(false);
@@ -228,7 +228,7 @@ CCMD (quickload)
return;
}

if (savegameManager.quickSaveSlot == NULL)
if (savegameManager.quickSaveSlot == NULL || savegameManager.quickSaveSlot == (FSaveGameNode*)1)
{
M_StartControlPanel(true);
// signal that whatever gets loaded should be the new quicksave

0 comments on commit 6cc9434

Please sign in to comment.
You can’t perform that action at this time.