aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kohaut2018-03-25 15:05:21 +0200
committerPeter Kohaut2018-03-25 15:10:42 +0200
commitb991123e83433f57996c972bbfd32cd845ce0041 (patch)
tree198e4c2639007e2c6a1a03115575ea2b97648c38
parent81d4426eee4f0cde249ceb208b3d450846271715 (diff)
downloadscummvm-rg350-b991123e83433f57996c972bbfd32cd845ce0041.tar.gz
scummvm-rg350-b991123e83433f57996c972bbfd32cd845ce0041.tar.bz2
scummvm-rg350-b991123e83433f57996c972bbfd32cd845ce0041.zip
BLADERUNNER: Fixed compilation warnings
-rw-r--r--engines/bladerunner/item.cpp12
-rw-r--r--engines/bladerunner/item.h2
-rw-r--r--engines/bladerunner/items.cpp6
-rw-r--r--engines/bladerunner/items.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/bladerunner/item.cpp b/engines/bladerunner/item.cpp
index 9aa50e366f..2f82fc0b35 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 1169f2e4d3..a6420d1857 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 0d442248e0..a2cb9da194 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 c1988dda14..ce29a77787 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);