[Scummvm-git-logs] scummvm master -> 993634f57186272bac3109c74eb767ab32fb3a7e

[Die4Ever]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
993634f571 GROOVIE: show Reserved for save slot 0 unless it's Open House


Commit: 993634f57186272bac3109c74eb767ab32fb3a7e
    https://github.com/scummvm/scummvm/commit/993634f57186272bac3109c74eb767ab32fb3a7e
Author: Die4Ever (die4ever2005 at gmail.com)
Date: 2022-02-15T17:23:46-06:00

Commit Message:
GROOVIE: show Reserved for save slot 0 unless it's Open House

Changed paths:
    engines/groovie/saveload.cpp


diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp
index cbca21a1b51..00ce89354c2 100644
--- a/engines/groovie/saveload.cpp
+++ b/engines/groovie/saveload.cpp
@@ -24,6 +24,7 @@
 
 #include "common/system.h"
 #include "common/substream.h"
+#include "common/translation.h"
 
 #define SUPPORTED_SAVEFILE_VERSION 1
 // 0 - Just script variables, compatible with the original
@@ -47,6 +48,10 @@ Common::String SaveLoad::getSlotSaveName(const Common::String &target, int slot)
 SaveStateList SaveLoad::listValidSaves(const Common::String &target) {
 	SaveStateList list;
 
+	// some Groovie 2 games use save 0 with a garbage name for internal tracking, other games use slot 0 for Open House mode
+	const Common::U32String reservedName = _("Reserved");
+	bool hasReserved = false;
+
 	// Get the list of savefiles
 	Common::String pattern = Common::String::format("%s.0##", target.c_str());
 	Common::StringArray savefiles = g_system->getSavefileManager()->listSavefiles(pattern);
@@ -71,11 +76,22 @@ SaveStateList SaveLoad::listValidSaves(const Common::String &target) {
 		if (file) {
 			// It's a valid savefile, save the descriptor
 			delete file;
+			if (slot == 0) {
+				hasReserved = true;
+				if (descriptor.getDescription() != "OPEN HOUSE" && descriptor.getDescription() != "Open House")
+					descriptor.setDescription(reservedName);
+			}
 			list.push_back(descriptor);
 		}
 		it++;
 	}
 
+	if (!hasReserved) {
+		SaveStateDescriptor desc;
+		desc.setDescription(reservedName);
+		list.push_back(desc);
+	}
+
 	return list;
 }