[Scummvm-cvs-logs] scummvm master -> b71123ef4f6ecfb8c60fa87d8fb2da0d2f40eded

[bluegr]

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:
ed9cf01c78 SAGA: Slight cleanup
b71123ef4f SAGA: properly remove the save reminder callback on engine exit


Commit: ed9cf01c78d639f0503ee8ea51c4033ff6158b1b
    https://github.com/scummvm/scummvm/commit/ed9cf01c78d639f0503ee8ea51c4033ff6158b1b
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-08-30T02:59:34-07:00

Commit Message:
SAGA: Slight cleanup

Changed paths:
    engines/saga/sthread.cpp



diff --git a/engines/saga/sthread.cpp b/engines/saga/sthread.cpp
index afd528f..6e5cc68 100644
--- a/engines/saga/sthread.cpp
+++ b/engines/saga/sthread.cpp
@@ -102,9 +102,8 @@ void Script::wakeUpThreadsDelayed(int waitType, int sleepTime) {
 void Script::executeThreads(uint msec) {
 	ScriptThreadList::iterator threadIterator;
 
-	if (_vm->_interface->_statusTextInput) {
+	if (_vm->_interface->_statusTextInput)
 		return;
-	}
 
 	threadIterator = _threadList.begin();
 
@@ -129,11 +128,10 @@ void Script::executeThreads(uint msec) {
 
 			switch (thread._waitType) {
 			case kWaitTypeDelay:
-				if (thread._sleepTime < msec) {
+				if (thread._sleepTime < msec)
 					thread._sleepTime = 0;
-				} else {
+				else
 					thread._sleepTime -= msec;
-				}
 
 				if (thread._sleepTime == 0)
 					thread._flags &= ~kTFlagWaiting;
@@ -141,11 +139,9 @@ void Script::executeThreads(uint msec) {
 
 			case kWaitTypeWalk:
 				{
-					ActorData *actor;
-					actor = (ActorData *)thread._threadObj;
-					if (actor->_currentAction == kActionWait) {
+					ActorData *actor = (ActorData *)thread._threadObj;
+					if (actor->_currentAction == kActionWait)
 						thread._flags &= ~kTFlagWaiting;
-					}
 				}
 				break;
 
@@ -157,9 +153,8 @@ void Script::executeThreads(uint msec) {
 		}
 
 		if (!(thread._flags & kTFlagWaiting)) {
-			if (runThread(thread)) {
+			if (runThread(thread))
 				break;
-			}
 		}
 
 		++threadIterator;


Commit: b71123ef4f6ecfb8c60fa87d8fb2da0d2f40eded
    https://github.com/scummvm/scummvm/commit/b71123ef4f6ecfb8c60fa87d8fb2da0d2f40eded
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-08-30T02:59:35-07:00

Commit Message:
SAGA: properly remove the save reminder callback on engine exit

This fixes an error when exiting to the launcher and restarting a game

Changed paths:
    engines/saga/interface.cpp



diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index fe37ed8..994b35c 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -324,6 +324,7 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
 }
 
 Interface::~Interface() {
+	_vm->getTimerManager()->removeTimerProc(&saveReminderCallback);
 }
 
 void Interface::saveReminderCallback(void *refCon) {