libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 09:49:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Fix some more shadowed variables and functions

Browse Source
This commit is contained in:
Strangerke 2014-02-21 19:35:37 +01:00
parent 0def54a60d
commit 3a6e4b381e
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/voyeur/files.cpp
View File

@ -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);
}

4
engines/voyeur/files.h
View File

@ -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();

2
engines/voyeur/files_threads.cpp
View File

@ -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;
}