[Scummvm-cvs-logs] scummvm master -> 7945cba560876eb6818c30e8b51c7f3118cc0148

Strangerke Strangerke at scummvm.org
Sun Feb 2 11:21:24 CET 2014


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

Summary:
7945cba560 MORTEVIELLE: Little refactoring in fctLook()


Commit: 7945cba560876eb6818c30e8b51c7f3118cc0148
    https://github.com/scummvm/scummvm/commit/7945cba560876eb6818c30e8b51c7f3118cc0148
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-02T02:20:08-08:00

Commit Message:
MORTEVIELLE: Little refactoring in fctLook()

Changed paths:
    engines/mortevielle/actions.cpp



diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index c5d5506..e13220d 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -481,13 +481,24 @@ void MortevielleEngine::fctLook() {
 		}
 		return;
 	}
+
 	int cx = _coreVar._currPlace;
-	if (_coreVar._currPlace == CHAPEL)
+	switch (_coreVar._currPlace) {
+	case CHAPEL:
 		cx = 17;
-	if ((_coreVar._currPlace > MANOR_FRONT) && (_coreVar._currPlace < DOOR))
+		break;
+	case MANOR_BACK:
+	case INSIDE_WELL:
+	case WELL:
 		cx -= 4;
-	if (_coreVar._currPlace == ROOM26)
+		break;
+	case ROOM26:
 		cx = 21;
+		break;
+	default:
+		break;
+	}
+
 	_crep = _tabdon[kArega + (cx * 7) + _num - 1];
 	if ((_coreVar._currPlace == ATTIC) && (_num == 8))
 		_crep = 126;






More information about the Scummvm-git-logs mailing list