[Scummvm-cvs-logs] scummvm master -> 886ea29bbfe5556729843d97637ea9f691382ddc

[sev-]

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

Summary:
64c3332138 SAGA: Fixed bug #3276033: IHNM: Savegame reminder not reset
886ea29bbf SCUMM: Add md5 from bug #3264965 for fbpack


Commit: 64c3332138bee36905e3df07ba58d0a7ca2c4206
    https://github.com/scummvm/scummvm/commit/64c3332138bee36905e3df07ba58d0a7ca2c4206
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-04-17T04:10:46-07:00

Commit Message:
SAGA: Fixed bug #3276033: IHNM: Savegame reminder not reset

Changed paths:
    engines/saga/interface.cpp
    engines/saga/interface.h
    engines/saga/saveload.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 5a3b229..0f84b09 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -1379,9 +1379,7 @@ void Interface::setSave(PanelButton *panelButton) {
 				fileName = _vm->calcSaveFileName(_vm->getSaveFile(_optionSaveFileTitleNumber)->slotNumber);
 				_vm->save(fileName, _textInputString);
 			}
-			_vm->getTimerManager()->removeTimerProc(&saveReminderCallback);
-			_vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
-			setSaveReminderState(1);
+			resetSaveReminder();
 
 			_textInput = false;
 			setMode(kPanelOption);
@@ -1393,6 +1391,12 @@ void Interface::setSave(PanelButton *panelButton) {
 	}
 }
 
+void Interface::resetSaveReminder() {
+	_vm->getTimerManager()->removeTimerProc(&saveReminderCallback);
+	_vm->getTimerManager()->installTimerProc(&saveReminderCallback, TIMETOSAVE, this);
+	setSaveReminderState(1);
+}
+
 void Interface::handleOptionUpdate(const Point& mousePoint) {
 	int16 mouseY;
 	Rect rect;
diff --git a/engines/saga/interface.h b/engines/saga/interface.h
index b9a9665..09631bf 100644
--- a/engines/saga/interface.h
+++ b/engines/saga/interface.h
@@ -288,6 +288,8 @@ public:
 
 	int32 getProtectHash() { return _protectHash; }
 
+	void resetSaveReminder();
+
 private:
 	void handleMainUpdate(const Point& mousePoint);					// main panel update
 	void handleMainClick(const Point& mousePoint);					// main panel click
diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 9edb79f..6a6992f 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -256,6 +256,8 @@ void SagaEngine::save(const char *fileName, const char *saveName) {
 		warning("Can't write file '%s'. (Disk full?)", fileName);
 
 	delete out;
+
+	_interface->resetSaveReminder();
 }
 
 void SagaEngine::load(const char *fileName) {


Commit: 886ea29bbfe5556729843d97637ea9f691382ddc
    https://github.com/scummvm/scummvm/commit/886ea29bbfe5556729843d97637ea9f691382ddc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-04-17T04:10:46-07:00

Commit Message:
SCUMM: Add md5 from bug #3264965 for fbpack

Changed paths:
    devtools/scumm-md5.txt
    engines/scumm/scumm-md5.h



diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 60fc615..e9e1559 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -466,6 +466,7 @@ fbear	Fatty Bear's Birthday Surprise
 fbpack	Fatty Bear's Fun Pack
 	e01acc8c12ef44e8f778fe87e5f90f4e	-1	en	3DO	-	-	-	sev
 	c9717ee6059f1e43b768b464493d2fba	-1	jp	3DO	-	-	-	clone2727
+	4cfd3fda4a4e6e64a1fc488eba973b7a	-1	en	DOS	-	-	-	velocity37
 	f06e66fd45b2f8b0f4a2833ff4476050	-1	he	DOS	-	-	-	sev
 
 freddi	Freddi Fish 1: The Case of the Missing Kelp Seeds
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 40eeba3..8f55581 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Mon Oct 18 00:42:16 2010
+  This file was generated by the md5table tool on Sun Apr 17 10:46:26 2011
   DO NOT EDIT MANUALLY!
  */
 
@@ -206,6 +206,7 @@ static const MD5Table md5table[] = {
 	{ "4c4820518e16e1a0e3616a3b021a04f3", "catalog", "HE CUP", "Preview", 10927456, Common::DE_DEU, Common::kPlatformUnknown },
 	{ "4cb9c3618f71668f8e4346c8f323fa82", "monkey2", "", "", 10700, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "4ce2d5b355964bbcb5e5ce73236ef868", "freddicove", "HE 100", "", -1, Common::RU_RUS, Common::kPlatformWindows },
+	{ "4cfd3fda4a4e6e64a1fc488eba973b7a", "fbpack", "", "", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "4d34042713958b971cb139fba4658586", "atlantis", "FM-TOWNS", "", -1, Common::JA_JPN, Common::kPlatformFMTowns },
 	{ "4dbff3787aedcd96b0b325f2d92d7ad9", "maze", "HE 100", "Updated", -1, Common::EN_USA, Common::kPlatformUnknown },
 	{ "4dc780f1bc587a193ce8a97652791438", "loom", "EGA", "EGA", -1, Common::EN_ANY, Common::kPlatformAmiga },