[Scummvm-cvs-logs] scummvm master -> 3a6e4b381ede711762694015cb5acdf415e4b30a
Strangerke
Strangerke at scummvm.org
Fri Feb 21 19:37:15 CET 2014
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:
3a6e4b381e VOYEUR: Fix some more shadowed variables and functions
Commit: 3a6e4b381ede711762694015cb5acdf415e4b30a
https://github.com/scummvm/scummvm/commit/3a6e4b381ede711762694015cb5acdf415e4b30a
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-21T10:35:37-08:00
Commit Message:
VOYEUR: Fix some more shadowed variables and functions
Changed paths:
engines/voyeur/files.cpp
engines/voyeur/files.h
engines/voyeur/files_threads.cpp
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 35e426b..78dc121 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -1252,7 +1252,7 @@ ViewPortResource::~ViewPortResource() {
delete _rectListPtr[i];
}
-void ViewPortResource::setupViewPort(PictureResource *page, Common::Rect *clipRect,
+void ViewPortResource::setupViewPort(PictureResource *page, Common::Rect *clippingRect,
ViewPortSetupPtr setupFn, ViewPortAddPtr addFn, ViewPortRestorePtr restoreFn) {
PictureResource *pic = _currentPic;
Common::Rect r = _bounds;
@@ -1284,24 +1284,24 @@ void ViewPortResource::setupViewPort(PictureResource *page, Common::Rect *clipRe
r.setHeight(yDiff <= r.height() ? r.height() - yDiff : 0);
}
- if (clipRect) {
+ if (clippingRect) {
// Clip based on the passed clip rectangles
- xDiff = clipRect->left - r.left;
- yDiff = clipRect->top - r.top;
+ xDiff = clippingRect->left - r.left;
+ yDiff = clippingRect->top - r.top;
if (xDiff > 0) {
int width = r.width();
- r.left = clipRect->left;
+ r.left = clippingRect->left;
r.setWidth(xDiff <= width ? width - xDiff : 0);
}
if (yDiff > 0) {
int height = r.height();
- r.top = clipRect->top;
+ r.top = clippingRect->top;
r.setHeight(yDiff <= height ? height - yDiff : 0);
}
- xDiff = r.right - clipRect->right;
- yDiff = r.bottom - clipRect->bottom;
+ xDiff = r.right - clippingRect->right;
+ yDiff = r.bottom - clippingRect->bottom;
if (xDiff > 0)
r.setWidth(xDiff <= r.width() ? r.width() - xDiff : 0);
@@ -1325,8 +1325,8 @@ void ViewPortResource::setupViewPort() {
&GraphicsManager::restoreMCGASaveRect);
}
-void ViewPortResource::setupViewPort(PictureResource *pic, Common::Rect *clipRect) {
- setupViewPort(pic, clipRect,
+void ViewPortResource::setupViewPort(PictureResource *pic, Common::Rect *clippingRect) {
+ setupViewPort(pic, clippingRect,
&GraphicsManager::setupMCGASaveRect, &GraphicsManager::addRectOptSaveRect,
&GraphicsManager::restoreMCGASaveRect);
}
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index ffc5937..c445afd 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -317,7 +317,7 @@ class ViewPortResource: public DisplayResource {
private:
BoltFilesState &_state;
private:
- void setupViewPort(PictureResource *page, Common::Rect *clipRect, ViewPortSetupPtr setupFn,
+ void setupViewPort(PictureResource *page, Common::Rect *clippingRect, ViewPortSetupPtr setupFn,
ViewPortAddPtr addFn, ViewPortRestorePtr restoreFn);
public:
ViewPortResource *_parent;
@@ -346,7 +346,7 @@ public:
virtual ~ViewPortResource();
void setupViewPort();
- void setupViewPort(PictureResource *pic, Common::Rect *clipRect = NULL);
+ void setupViewPort(PictureResource *pic, Common::Rect *clippingRect = NULL);
void addSaveRect(int pageIndex, const Common::Rect &r);
void fillPic(byte onOff = 0);
void drawIfaceTime();
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 501e62b..ee626fd 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -771,7 +771,7 @@ const byte *ThreadResource::cardPerform(const byte *card) {
idx2 = *card++;
int &v1 = _vm->_controlPtr->_state->_vals[idx1];
- int &v2 = _vm->_controlPtr->_state->_vals[idx2];
+ v2 = _vm->_controlPtr->_state->_vals[idx2];
v1 /= v2;
break;
}
More information about the Scummvm-git-logs
mailing list