[Scummvm-cvs-logs] SF.net SVN: scummvm:[43439] scummvm/branches/branch-1-0-0

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Aug 16 14:15:45 CEST 2009


Revision: 43439
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43439&view=rev
Author:   lordhoto
Date:     2009-08-16 12:15:44 +0000 (Sun, 16 Aug 2009)

Log Message:
-----------
Backport of r43436, r43437 and r43438. Fixes for SCUMM F5 menu and GMM's save/load dialog.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp
    scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h
    scummvm/branches/branch-1-0-0/gui/saveload.cpp

Modified: scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp	2009-08-16 12:11:45 UTC (rev 43438)
+++ scummvm/branches/branch-1-0-0/engines/scumm/dialogs.cpp	2009-08-16 12:15:44 UTC (rev 43439)
@@ -471,10 +471,13 @@
 	delete _loadDialog;
 }
 
+int ScummMenuDialog::runModal() {
+	_saveButton->setEnabled(_vm->canSaveGameStateCurrently());
+	return ScummDialog::runModal();
+}
+
 void ScummMenuDialog::reflowLayout() {
-	if (!_vm->canSaveGameStateCurrently())
-		_saveButton->setEnabled(false);
-
+	_saveButton->setEnabled(_vm->canSaveGameStateCurrently());
 	Dialog::reflowLayout();
 }
 

Modified: scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h	2009-08-16 12:11:45 UTC (rev 43438)
+++ scummvm/branches/branch-1-0-0/engines/scumm/dialogs.h	2009-08-16 12:15:44 UTC (rev 43439)
@@ -90,6 +90,7 @@
 
 	virtual void reflowLayout();
 
+	int runModal();
 protected:
 	ScummEngine		*_vm;
 

Modified: scummvm/branches/branch-1-0-0/gui/saveload.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/gui/saveload.cpp	2009-08-16 12:11:45 UTC (rev 43438)
+++ scummvm/branches/branch-1-0-0/gui/saveload.cpp	2009-08-16 12:15:44 UTC (rev 43439)
@@ -235,6 +235,11 @@
 	bool isWriteProtected = false;
 	bool startEditMode = _list->isEditable();
 
+	_gfxWidget->setGfx(-1, -1, _fillR, _fillG, _fillB);
+	_date->setLabel("No date saved");
+	_time->setLabel("No time saved");
+	_playtime->setLabel("No playtime saved");
+
 	if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) {
 		SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), atoi(_saveList[selItem].save_slot().c_str()));
 
@@ -250,36 +255,20 @@
 			if (thumb) {
 				_gfxWidget->setGfx(thumb);
 				_gfxWidget->useAlpha(256);
-			} else {
-				_gfxWidget->setGfx(-1, -1, _fillR, _fillG, _fillB);
 			}
 		}
 
 		if (_saveDateSupport) {
-			Common::String date = "Date: ";
 			if (desc.contains("save_date"))
-				date += desc.getVal("save_date");
-			else
-				date = "No date saved";
+				_date->setLabel("Date: " + desc.getVal("save_date"));
 
-			Common::String time = "Time: ";
 			if (desc.contains("save_time"))
-				time += desc.getVal("save_time");
-			else
-				time = "No time saved";
-
-			_date->setLabel(date);
-			_time->setLabel(time);
+				_time->setLabel("Time: " + desc.getVal("save_time"));
 		}
 
 		if (_playTimeSupport) {
-			Common::String time = "Playtime: ";
 			if (desc.contains("play_time"))
-				time += desc.getVal("play_time");
-			else
-				time = "No playtime saved";
-
-			_playtime->setLabel(time);
+				_playtime->setLabel("Playtime: " + desc.getVal("play_time"));
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list