[Scummvm-cvs-logs] scummvm master -> 5a794448434cb6f42ecd5a71dcc564ff7d296c9b

[Strangerke]

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

Summary:
9c3cefa6f0 MORTEVIELLE: Silent CID 1063229
6cfd3028c1 MORTEVIELLE: Fix CID 1063213
5a79444843 MORTEVIELLE: Fix CID 1063212


Commit: 9c3cefa6f0ec801a99c697e796b985e14012379e
    https://github.com/scummvm/scummvm/commit/9c3cefa6f0ec801a99c697e796b985e14012379e
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T13:12:20-07:00

Commit Message:
MORTEVIELLE: Silent CID 1063229

Changed paths:
    engines/mortevielle/utils.cpp



diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index de184bf..5ca29d8 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -67,9 +67,10 @@ bool MortevielleEngine::keyPressed() {
  * @remarks	Originally called 'get_ch'
  */
 int MortevielleEngine::getChar() {
+	bool end = false;
 	// If there isn't any pending keypress, wait until there is
-	while (!shouldQuit() && _keypresses.empty()) {
-		keyPressed();
+	while (!shouldQuit() && !end) {
+		end = keyPressed();
 	}
 
 	// Return the top keypress


Commit: 6cfd3028c1fdf71238f12e79fba4750e63a92a67
    https://github.com/scummvm/scummvm/commit/6cfd3028c1fdf71238f12e79fba4750e63a92a67
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T13:31:39-07:00

Commit Message:
MORTEVIELLE: Fix CID 1063213

Changed paths:
    engines/mortevielle/actions.cpp



diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index b76b7e8..4de2ebc 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -626,9 +626,20 @@ void MortevielleEngine::fctOpen() {
 			_coreVar._faithScore += 2;
 		++_openObjCount;
 		int i;
-		for (i = 1; (i <= 6) && (_openObjects[i] != 0) && (_openObjects[i] != _num); i++)
-			;
-		if (_openObjects[i] != _num) {
+		for (i = 1; (i <= 6); i++) {
+			if ((_openObjects[i] == 0) || (_openObjects[i] == _num))
+				break;
+		}
+
+		if (i > 7) {
+			warning("Unexpected action: Too many open objects");
+			return;
+		}
+
+		if (_openObjects[i] == _num)
+			// display "Already Opened"
+			_crep = 18;
+		else {
 			if (!( ((_num == 3) && ((_coreVar._currPlace == OWN_ROOM)
 				                 || (_coreVar._currPlace == JULIA_ROOM)
 								 || (_coreVar._currPlace == BLUE_ROOM)
@@ -661,9 +672,7 @@ void MortevielleEngine::fctOpen() {
 			_crep = _tabdon[kAouvr + (tmpPlace * 7) + _num - 1];
 			if (_crep == 254)
 				_crep = 999;
-		} else
-			// display "Already Opened"
-			_crep = 18;
+		}
 	}
 }
 


Commit: 5a794448434cb6f42ecd5a71dcc564ff7d296c9b
    https://github.com/scummvm/scummvm/commit/5a794448434cb6f42ecd5a71dcc564ff7d296c9b
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-08-21T13:36:14-07:00

Commit Message:
MORTEVIELLE: Fix CID 1063212

Changed paths:
    engines/mortevielle/actions.cpp



diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 4de2ebc..d5b3bd2 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -1008,8 +1008,16 @@ void MortevielleEngine::fctSelfPut() {
 				_crep = 997;
 			else {
 				int i;
-				for (i = 1; (i <= 6) && (_num != _openObjects[i]); i++)
-					;
+				for (i = 1; i <= 6; i++) {
+					if (_num == _openObjects[i])
+						break;
+				}
+
+				if (i > 6) {
+					warning("Unexpected action: Too many open objects");
+					return;
+				}
+
 				if (_num == _openObjects[i]) {
 					_curSearchObjId = objId;
 					_crep = 999;