diff options
author | D G Turner | 2017-01-11 15:09:14 +0000 |
---|---|---|
committer | D G Turner | 2017-01-11 15:09:14 +0000 |
commit | e66cec02509cfcef289819d66567e13bdd5e66af (patch) | |
tree | 426c9e65b1e99daae8a07e5475887749408d6973 /engines | |
parent | 23e0bc5d8d9535a68dc414f198e7f5d4dbbdfe63 (diff) | |
download | scummvm-rg350-e66cec02509cfcef289819d66567e13bdd5e66af.tar.gz scummvm-rg350-e66cec02509cfcef289819d66567e13bdd5e66af.tar.bz2 scummvm-rg350-e66cec02509cfcef289819d66567e13bdd5e66af.zip |
BLADERUNNER: Fix Variable Shadowing Compiler Warnings.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/bladerunner/item.cpp | 8 | ||||
-rw-r--r-- | engines/bladerunner/item.h | 2 | ||||
-rw-r--r-- | engines/bladerunner/items.cpp | 8 | ||||
-rw-r--r-- | engines/bladerunner/items.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/bladerunner/item.cpp b/engines/bladerunner/item.cpp index 6200668e14..b8d4cd2c1f 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 3f12a6ad3a..0c74bf3be3 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 2bc06e0a72..6fa17dffd5 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 667117fba2..c288e93bae 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); |