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

[sev-]

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:
70d83d20b0 PRINCE: Remove unnecessary reassignment
68738cef0f PRINCE: Bail out on unknown language
5fd804f267 PRINCE: Read O_FLCSPEED command argument


Commit: 70d83d20b0771ddeb017cf6e4b1e067ef97957b2
    https://github.com/scummvm/scummvm/commit/70d83d20b0771ddeb017cf6e4b1e067ef97957b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:14:21+02:00

Commit Message:
PRINCE: Remove unnecessary reassignment

Changed paths:
    engines/prince/script.cpp



diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index b778bd3..d03b9b5 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -1614,7 +1614,6 @@ void Interpreter::O_BACKANIMRANGE() {
 		int currAnim = _vm->_backAnimList[slotId]._seq._currRelative;
 		if (_vm->_backAnimList[slotId].backAnims[currAnim]._animData != nullptr) {
 			if (animId == 0xFFFF || _vm->_backAnimList[slotId]._seq._current == animId) {
-				int currAnim = _vm->_backAnimList[slotId]._seq._currRelative;
 				Anim &backAnim = _vm->_backAnimList[slotId].backAnims[currAnim];
 				if (!backAnim._state) {
 					if (backAnim._frame >= low) {


Commit: 68738cef0f91bd6b18c39bd22a6e8e120e2b39f5
    https://github.com/scummvm/scummvm/commit/68738cef0f91bd6b18c39bd22a6e8e120e2b39f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:17:52+02:00

Commit Message:
PRINCE: Bail out on unknown language

Changed paths:
    engines/prince/prince.cpp



diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 78de9a8..8230327 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -2654,6 +2654,7 @@ void PrinceEngine::checkInvOptions() {
 				invText = invOptionsTextEN[i];
 				break;
 			default:
+				error("Unknown game language %d", getLanguage());
 				break;
 			};
 			uint16 textW = getTextWidth(invText.c_str());


Commit: 5fd804f2679a5ed497b47b27c8fa7970f0d1ddb6
    https://github.com/scummvm/scummvm/commit/5fd804f2679a5ed497b47b27c8fa7970f0d1ddb6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-10-10T14:18:23+02:00

Commit Message:
PRINCE: Read O_FLCSPEED command argument

Changed paths:
    engines/prince/script.cpp



diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index d03b9b5..c675b6d 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -1882,7 +1882,8 @@ void Interpreter::O_VIEWFLCLOOP() {
 
 // Not used in script
 void Interpreter::O_FLCSPEED() {
-	error("O_FLCSPEED speed");
+	int32 speed = readScriptFlagValue();
+	error("O_FLCSPEED speed %d", speed);
 }
 
 void Interpreter::O_OPENINVENTORY() {