[Scummvm-git-logs] scummvm master -> 68de00b36727424c2ea6c1a2d078288659492ab3

[digitall]

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:
e66cec0250 BLADERUNNER: Fix Variable Shadowing Compiler Warnings.
68de00b367 BLADERUNNER: Fix Unused Variable Compiler Warnings.


Commit: e66cec02509cfcef289819d66567e13bdd5e66af
    https://github.com/scummvm/scummvm/commit/e66cec02509cfcef289819d66567e13bdd5e66af
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-11T15:09:14Z

Commit Message:
BLADERUNNER: Fix Variable Shadowing Compiler Warnings.

Changed paths:
    engines/bladerunner/item.cpp
    engines/bladerunner/item.h
    engines/bladerunner/items.cpp
    engines/bladerunner/items.h


diff --git a/engines/bladerunner/item.cpp b/engines/bladerunner/item.cpp
index 6200668..b8d4cd2 100644
--- a/engines/bladerunner/item.cpp
+++ b/engines/bladerunner/item.cpp
@@ -122,7 +122,7 @@ void Item::setXYZ(Vector3 position) {
 	_depth = screenPosition.z * 25.5f;
 }
 
-void Item::setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetable, bool isVisible, bool isPoliceMazeEnemy) {
+void Item::setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetableFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag) {
 	_itemId = itemId;
 	_setId = setId;
 	_animationId = animationId;
@@ -130,9 +130,9 @@ void Item::setup(int itemId, int setId, int animationId, Vector3 position, int f
 	_angle = facing * (M_PI / 512.0f);
 	_width = width;
 	_height = height;
-	_isTargetable = isTargetable;
-	_isVisible = isVisible;
-	_isPoliceMazeEnemy = isPoliceMazeEnemy;
+	_isTargetable = isTargetableFlag;
+	_isVisible = isVisibleFlag;
+	_isPoliceMazeEnemy = isPoliceMazeEnemyFlag;
 	setXYZ(position);
 	_screenRectangle.bottom = -1;
 	_screenRectangle.right = -1;
diff --git a/engines/bladerunner/item.h b/engines/bladerunner/item.h
index 3f12a6a..0c74bf3 100644
--- a/engines/bladerunner/item.h
+++ b/engines/bladerunner/item.h
@@ -70,7 +70,7 @@ public:
 	bool isTargetable();
 	void tick(bool special);
 
-	void setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetable, bool isVisible, bool isPoliceMazeEnemy);
+	void setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetableFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag);
 };
 
 }
diff --git a/engines/bladerunner/items.cpp b/engines/bladerunner/items.cpp
index 2bc06e0..6fa17df 100644
--- a/engines/bladerunner/items.cpp
+++ b/engines/bladerunner/items.cpp
@@ -62,7 +62,7 @@ void Items::tick() {
 	}
 }
 
-bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetable, bool isVisible, bool isPoliceMazeEnemy, bool addToSet) {
+bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetableFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag, bool addToSetFlag) {
 	if (_items.size() >= 100) {
 		return false;
 	}
@@ -72,11 +72,11 @@ bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position,
 	}
 
 	Item *item = new Item(_vm);
-	item->setup(itemId, setId, animationId, position, facing, height, width, isTargetable, isVisible, isPoliceMazeEnemy);
+	item->setup(itemId, setId, animationId, position, facing, height, width, isTargetableFlag, isVisibleFlag, isPoliceMazeEnemyFlag);
 	_items.push_back(item);
 
-	if (addToSet && setId == _vm->_scene->getSetId()) {
-		return _vm->_sceneObjects->addItem(itemId + SCENE_OBJECTS_ITEMS_OFFSET, &item->_boundingBox, &item->_screenRectangle, isTargetable, isVisible);
+	if (addToSetFlag && setId == _vm->_scene->getSetId()) {
+		return _vm->_sceneObjects->addItem(itemId + SCENE_OBJECTS_ITEMS_OFFSET, &item->_boundingBox, &item->_screenRectangle, isTargetableFlag, isVisibleFlag);
 	}
 	return true;
 }
diff --git a/engines/bladerunner/items.h b/engines/bladerunner/items.h
index 667117f..c288e93 100644
--- a/engines/bladerunner/items.h
+++ b/engines/bladerunner/items.h
@@ -43,7 +43,7 @@ public:
 	void getWidthHeight(int itemId, int *width, int *height);
 
 	void tick();
-	bool addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetable, bool isVisible, bool isPoliceMazeEnemy, bool b);
+	bool addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetableFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag, bool addToSetFlag);
 	bool addToSet(int itemId);
 	bool remove(int itemId);
 


Commit: 68de00b36727424c2ea6c1a2d078288659492ab3
    https://github.com/scummvm/scummvm/commit/68de00b36727424c2ea6c1a2d078288659492ab3
Author: D G Turner (digitall at scummvm.org)
Date: 2017-01-11T15:10:01Z

Commit Message:
BLADERUNNER: Fix Unused Variable Compiler Warnings.

Changed paths:
    engines/bladerunner/vqa_decoder.cpp


diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index fe94012..15bf493 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -434,10 +434,9 @@ bool VQADecoder::readCINF(Common::SeekableReadStream *s, uint32 size) {
 		return false;
 
 	for (int i = 0; i != _clipInfo.clipCount; ++i) {
-		uint16 a;
-		uint32 b;
-		a = s->readUint16LE();
-		b = s->readUint32LE();
+		uint16 a = s->readUint16LE();
+		uint32 b = s->readUint32LE();
+		debug("VQADecoder::readCINF() i: %d a: 0x%04x b: 0x%08x", i, a, b);
 	}
 
 	return true;
@@ -471,13 +470,13 @@ bool VQADecoder::readLNIN(Common::SeekableReadStream *s, uint32 size) {
 	if (chd.id != kLNIH || chd.size != 10)
 		return false;
 
-	uint16 loopNamesCount, loopUnk1, loopUnk2, loopUnk3, loopUnk4;
+	uint16 loopNamesCount = s->readUint16LE();
+	uint16 loopUnk1       = s->readUint16LE();
+	uint16 loopUnk2       = s->readUint16LE();
+	uint16 loopUnk3       = s->readUint16LE();
+	uint16 loopUnk4       = s->readUint16LE();
 
-	loopNamesCount = s->readUint16LE();
-	loopUnk1       = s->readUint16LE();
-	loopUnk2       = s->readUint16LE();
-	loopUnk3       = s->readUint16LE();
-	loopUnk4       = s->readUint16LE();
+	debug("VQADecoder::readLNIN() Unknown Values: 0x%04x 0x%04x 0x%04x 0x%04x", loopUnk1, loopUnk2, loopUnk3, loopUnk4);
 
 	if (loopNamesCount != _loopInfo.loopCount)
 		return false;