Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
BLADERUNNER: Fix PoliceMaze track
  • Loading branch information
sev- committed Mar 24, 2018
1 parent 94e2d51 commit cb07644
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions engines/bladerunner/item.h
Expand Up @@ -73,6 +73,7 @@ class Item {
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;
Expand Down
8 changes: 8 additions & 0 deletions engines/bladerunner/items.cpp
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions engines/bladerunner/items.h
Expand Up @@ -50,6 +50,7 @@ class Items {

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);
Expand Down
3 changes: 2 additions & 1 deletion engines/bladerunner/script/police_maze.cpp
Expand Up @@ -73,6 +73,7 @@ void PoliceMaze::activate() {
}

void PoliceMaze::setPauseState(bool state) {
warning("PAUSE: %d", state);
_isPaused = state;

uint32 t = _vm->getTotalPlayTime();
Expand Down Expand Up @@ -205,7 +206,7 @@ bool PoliceMazeTargetTrack::tick() {
_waitTime = 0;
}

if (_vm->_items->isTarget(_itemId))
if (_vm->_items->isSpinning(_itemId))
return true;

if (_rotating) {
Expand Down

0 comments on commit cb07644

Please sign in to comment.