[Scummvm-git-logs] scummvm master -> cb076448770a3e4a41405b5eac1d1dd1714cb5c8

[sev-]

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:
cb07644877 BLADERUNNER: Fix PoliceMaze track


Commit: cb076448770a3e4a41405b5eac1d1dd1714cb5c8
    https://github.com/scummvm/scummvm/commit/cb076448770a3e4a41405b5eac1d1dd1714cb5c8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-03-24T12:42:23+01:00

Commit Message:
BLADERUNNER: Fix PoliceMaze track

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


diff --git a/engines/bladerunner/item.h b/engines/bladerunner/item.h
index 2c0ce97..3beca15 100644
--- a/engines/bladerunner/item.h
+++ b/engines/bladerunner/item.h
@@ -73,6 +73,7 @@ public:
 	void setIsTarget(bool isTarget) { _isTarget = isTarget; }
 
 	bool isTarget() const;
+	bool isSpinning() const { return _isSpinning; }
 	bool isVisible() const { return _isVisible; }
 	void setVisible(bool val) { _isVisible = val; }
 	bool isPoliceMazeEnemy() const;
diff --git a/engines/bladerunner/items.cpp b/engines/bladerunner/items.cpp
index f18ed72..0348efc 100644
--- a/engines/bladerunner/items.cpp
+++ b/engines/bladerunner/items.cpp
@@ -142,6 +142,14 @@ bool Items::isTarget(int itemId) const {
 	return _items[itemIndex]->isTarget();
 }
 
+bool Items::isSpinning(int itemId) const {
+	int itemIndex = findItem(itemId);
+	if (itemIndex == -1) {
+		return false;
+	}
+	return _items[itemIndex]->isSpinning();
+}
+
 bool Items::isVisible(int itemId) const {
 	int itemIndex = findItem(itemId);
 	if (itemIndex == -1) {
diff --git a/engines/bladerunner/items.h b/engines/bladerunner/items.h
index ddb94cd..6bbc99c 100644
--- a/engines/bladerunner/items.h
+++ b/engines/bladerunner/items.h
@@ -50,6 +50,7 @@ public:
 
 	void setIsTarget(int itemId, bool isTarget);
 	bool isTarget(int itemId) const;
+	bool isSpinning(int itemId) const;
 	bool isPoliceMazeEnemy(int itemId) const;
 	void setPoliceMazeEnemy(int itemId, bool val);
 	void setIsObstacle(int itemId, bool val);
diff --git a/engines/bladerunner/script/police_maze.cpp b/engines/bladerunner/script/police_maze.cpp
index 78c8076..f9beec0 100644
--- a/engines/bladerunner/script/police_maze.cpp
+++ b/engines/bladerunner/script/police_maze.cpp
@@ -73,6 +73,7 @@ void PoliceMaze::activate() {
 }
 
 void PoliceMaze::setPauseState(bool state) {
+	warning("PAUSE: %d", state);
 	_isPaused = state;
 
 	uint32 t = _vm->getTotalPlayTime();
@@ -205,7 +206,7 @@ bool PoliceMazeTargetTrack::tick() {
 		_waitTime = 0;
 	}
 
-	if (_vm->_items->isTarget(_itemId))
+	if (_vm->_items->isSpinning(_itemId))
 		return true;
 
 	if (_rotating) {