Ticket #9065: gmm-load_del_empty-v2.patch

gui/saveload.cpp

@@ -235 +235 @@
         bool isWriteProtected = false;
         bool startEditMode = _list->isEditable();
 
-        if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) {
+        // Only try to fetch meta information about a savegame if
+        // 1) there's a savegame selected,
+        // 2) it is not a dummy one (i.e. a filler for a gap in the savegame list)
+        // 3) and the engine supports savegame meta information.
+        if (selItem >= 0 && !_saveList[selItem].getBool("is_dummy") && _metaInfoSupport) {
                 SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), atoi(_saveList[selItem].save_slot().c_str()));
 
                 isDeletable = desc.getBool("is_deletable") && _delSupport;
@@ -292 +296 @@
                 if (startEditMode)
                         _list->startEditMode();
         } else {
-                // Disable the load button if nothing is selected, or if an empty
+                // Disable the load button if nothing is selected, or if a dummy
                 // list item is selected.
-                _chooseButton->setEnabled(selItem >= 0 && !_list->getSelectedString().empty());
+                _chooseButton->setEnabled(selItem >= 0 && !_saveList[selItem].getBool("is_dummy"));
         }
 
         // Delete will always be disabled if the engine doesn't support it.
-        _deleteButton->setEnabled(isDeletable && (selItem >= 0) && (!_list->getSelectedString().empty()));
+        // Also don't allow trying to delete dummy list items.
+        _deleteButton->setEnabled(isDeletable && (selItem >= 0) && (!_saveList[selItem].getBool("is_dummy")));
 
         if (redraw) {
                 _gfxWidget->draw();
@@ -328 +333 @@
         int saveSlot = 0;
         StringList saveNames;
         for (SaveStateList::const_iterator x = _saveList.begin(); x != _saveList.end(); ++x) {
-                // Handle gaps in the list of save games
+                // Handle gaps in the list of save games by filling them with dummy SaveStateDescriptors
                 saveSlot = atoi(x->save_slot().c_str());
                 if (curSlot < saveSlot) {
                         while (curSlot < saveSlot) {
                                 SaveStateDescriptor dummySave(curSlot, "");
+                                dummySave.setDummyFlag(true);
                                 _saveList.insert_at(curSlot, dummySave);
                                 saveNames.push_back(dummySave.description());
                                 curSlot++;
@@ -345 +351 @@
                         }
                 }
 
-                saveNames.push_back(x->description());
+                // Show "Untitled savestate" for empty/whitespace savegame descriptions
+                Common::String description = x->description();
+                Common::String trimmedDescription = description;
+                trimmedDescription.trim();
+                if (trimmedDescription.empty())
+                        description = "Untitled savestate";
+
+                saveNames.push_back(description);
                 curSlot++;
         }
 
-        // Fill the rest of the save slots with empty saves
+        // Fill the rest of the save slots with dummy saves
         Common::String emptyDesc;
         for (int i = curSlot; i <= (*_plugin)->getMaximumSaveSlot(); i++) {
                 saveNames.push_back(emptyDesc);
                 SaveStateDescriptor dummySave(i, "");
+                dummySave.setDummyFlag(true);
                 _saveList.push_back(dummySave);
         }
 

engines/game.cpp

@@ -128 +128 @@
         return false;
 }
 
+void SaveStateDescriptor::setDummyFlag(bool state) {
+        setVal("is_dummy", state ? "true" : "false");
+}
+
 void SaveStateDescriptor::setDeletableFlag(bool state) {
         setVal("is_deletable", state ? "true" : "false");
 }

engines/game.h

@@ -166 +166 @@
         bool getBool(const Common::String &key) const;
 
         /**
+         * Sets the 'is_dummy' key, which indicates if the
+         * given savestate is a dummy one
+         * (i.e. a filler for a gap in the savegame list).
+         */
+        void setDummyFlag(bool state);
+
+        /**
          * Sets the 'is_deletable' key, which indicates if the
          * given savestate is safe for deletion.
          */