libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 07:39:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Fix some shadowed variables in GraphicsManager

Browse Source
This commit is contained in:
Strangerke 2014-02-21 08:05:09 +01:00
parent 46b7c1fde4
commit eee040cd29
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engines/voyeur/graphics.cpp
View File

@ -469,16 +469,16 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
} else {
// loc_26543
for (int yp = 0; yp < height1; ++yp) {
int runLength = 0;
for (int xp = 0; xp < width2; ++xp, --runLength) {
if (runLength <= 0) {
int runLen = 0;
for (int xp = 0; xp < width2; ++xp, --runLen) {
if (runLen <= 0) {
// Start of run length, so get pixel and repeat length
pixel = *srcP++;
if (pixel & 0x80) {
pixel &= 0x7f;
runLength = *srcP++;
if (runLength == 0)
runLength = width2;
runLen = *srcP++;
if (runLen == 0)
runLen = width2;
}
}
@ -552,7 +552,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
if (!(srcFlags & PICFLAG_PIC_OFFSET)) {
srcP = srcImgData += srcOffset;
int pixel = 0;
pixel = 0;
if (destFlags & PICFLAG_PIC_OFFSET) {
destP = destImgData + screenOffset;
@ -569,15 +569,15 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
height1 = tmpHeight + height1;
for (int yp = 0; yp < height1; ++yp) {
int runLength = 0;
for (int xp = 0; xp < width2; ++xp, --runLength) {
if (runLength <= 0) {
int runLen = 0;
for (int xp = 0; xp < width2; ++xp, --runLen) {
if (runLen <= 0) {
pixel = *srcP++;
if (pixel & 0x80) {
pixel &= 0x7F;
runLength = *srcP++;
if (!runLength)
runLength = width2;
runLen = *srcP++;
if (!runLen)
runLen = width2;
}
}
@ -596,7 +596,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
destP = (byte *)_screenSurface.getPixels() + screenOffset;
for (int yp = 0; yp < height1; ++yp) {
for (int xp = 0; xp < width2; ++xp, ++destP) {
for (int xi = 0; xi < width2; ++xi, ++destP) {
byteVal2 = 0;
for (int xp = 0; xp < width2; ++xp, ++destP, --byteVal2) {
if (!byteVal2) {