[Scummvm-git-logs] scummvm master -> 3693be69e8198b7928c4c3203b08b992a2dfa5e7

[peterkohaut]

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:
b991123e83 BLADERUNNER: Fixed compilation warnings
3693be69e8 BLADERUNNER: Added missing initializon of scene objects


Commit: b991123e83433f57996c972bbfd32cd845ce0041
    https://github.com/scummvm/scummvm/commit/b991123e83433f57996c972bbfd32cd845ce0041
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2018-03-25T15:10:42+02:00

Commit Message:
BLADERUNNER: Fixed compilation 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 9aa50e3..2f82fc0 100644
--- a/engines/bladerunner/item.cpp
+++ b/engines/bladerunner/item.cpp
@@ -84,7 +84,7 @@ bool Item::tick(Common::Rect *screenRect, bool special) {
 		return false;
 	}
 
-	bool isVisible = false;
+	bool isVisibleFlag = false;
 
 	Vector3 position(_position.x, -_position.z, _position.y);
 	int animationId = _animationId + (special ? 1 : 0);
@@ -93,7 +93,7 @@ bool Item::tick(Common::Rect *screenRect, bool special) {
 
 	if (!_screenRectangle.isEmpty()) {
 		*screenRect = _screenRectangle;
-		isVisible = true;
+		isVisibleFlag = true;
 	} else {
 		*screenRect = Common::Rect();
 	}
@@ -125,7 +125,7 @@ bool Item::tick(Common::Rect *screenRect, bool special) {
 		}
 	}
 
-	return isVisible;
+	return isVisibleFlag;
 }
 
 void Item::setXYZ(Vector3 position) {
@@ -139,7 +139,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 isTargetFlag, bool isVisible, bool isPoliceMazeEnemy) {
+void Item::setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag) {
 	_itemId = itemId;
 	_setId = setId;
 	_animationId = animationId;
@@ -148,8 +148,8 @@ void Item::setup(int itemId, int setId, int animationId, Vector3 position, int f
 	_width = width;
 	_height = height;
 	_isTarget = isTargetFlag;
-	_isVisible = isVisible;
-	_isPoliceMazeEnemy = isPoliceMazeEnemy;
+	_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 1169f2e..a6420d1 100644
--- a/engines/bladerunner/item.h
+++ b/engines/bladerunner/item.h
@@ -83,7 +83,7 @@ public:
 	void spinInWorld();
 	bool tick(Common::Rect *screenRect, bool special);
 
-	void setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisible, bool isPoliceMazeEnemy);
+	void setup(int itemId, int setId, int animationId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag);
 
 	bool isUnderMouse(int mouseX, int mouseY) const;
 
diff --git a/engines/bladerunner/items.cpp b/engines/bladerunner/items.cpp
index 0d44224..a2cb9da 100644
--- a/engines/bladerunner/items.cpp
+++ b/engines/bladerunner/items.cpp
@@ -75,7 +75,7 @@ void Items::tick() {
 	}
 }
 
-bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisible, bool isPoliceMazeEnemy, bool addToSetFlag) {
+bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag, bool addToSetFlag) {
 	if (_items.size() >= 100) {
 		return false;
 	}
@@ -86,10 +86,10 @@ bool Items::addToWorld(int itemId, int animationId, int setId, Vector3 position,
 	}
 
 	Item *item = _items[itemIndex];
-	item->setup(itemId, setId, animationId, position, facing, height, width, isTargetFlag, isVisible, isPoliceMazeEnemy);
+	item->setup(itemId, setId, animationId, position, facing, height, width, isTargetFlag, isVisibleFlag, isPoliceMazeEnemyFlag);
 
 	if (addToSetFlag && setId == _vm->_scene->getSetId()) {
-		return _vm->_sceneObjects->addItem(itemId + kSceneObjectOffsetItems, item->_boundingBox, item->_screenRectangle, isTargetFlag, isVisible);
+		return _vm->_sceneObjects->addItem(itemId + kSceneObjectOffsetItems, item->_boundingBox, item->_screenRectangle, isTargetFlag, isVisibleFlag);
 	}
 	return true;
 }
diff --git a/engines/bladerunner/items.h b/engines/bladerunner/items.h
index c1988dd..ce29a77 100644
--- a/engines/bladerunner/items.h
+++ b/engines/bladerunner/items.h
@@ -47,7 +47,7 @@ public:
 	void getWidthHeight(int itemId, int *width, int *height) const;
 
 	void tick();
-	bool addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisible, bool isPoliceMazeEnemy, bool addToSetFlag);
+	bool addToWorld(int itemId, int animationId, int setId, Vector3 position, int facing, int height, int width, bool isTargetFlag, bool isVisibleFlag, bool isPoliceMazeEnemyFlag, bool addToSetFlag);
 	bool addToSet(int itemId);
 	bool remove(int itemId);
 


Commit: 3693be69e8198b7928c4c3203b08b992a2dfa5e7
    https://github.com/scummvm/scummvm/commit/3693be69e8198b7928c4c3203b08b992a2dfa5e7
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2018-03-25T15:10:55+02:00

Commit Message:
BLADERUNNER: Added missing initializon of scene objects

Changed paths:
    engines/bladerunner/scene_objects.cpp


diff --git a/engines/bladerunner/scene_objects.cpp b/engines/bladerunner/scene_objects.cpp
index 6857416..30802a8 100644
--- a/engines/bladerunner/scene_objects.cpp
+++ b/engines/bladerunner/scene_objects.cpp
@@ -36,9 +36,7 @@ SceneObjects::SceneObjects(BladeRunnerEngine *vm, View *view) {
 
 	_count = 0;
 
-	for (int i = 0; i < kSceneObjectCount; ++i) {
-		_sceneObjectsSortedByDistance[i] = -1;
-	}
+	clear();
 }
 
 SceneObjects::~SceneObjects() {