[Scummvm-git-logs] scummvm master -> c55e8f9544f379d02dfd1bf93217144f04a7abc2
Strangerke
Strangerke at scummvm.org
Wed Feb 8 16:13:57 CET 2017
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:
c55e8f9544 CRYO: Fix some shadowed member
Commit: c55e8f9544f379d02dfd1bf93217144f04a7abc2
https://github.com/scummvm/scummvm/commit/c55e8f9544f379d02dfd1bf93217144f04a7abc2
Author: Strangerke (strangerke at scummvm.org)
Date: 2017-02-08T16:11:20+01:00
Commit Message:
CRYO: Fix some shadowed member
Changed paths:
engines/cryo/eden.cpp
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 77d7788..2be4799 100644
--- a/engines/cryo/eden.cpp
+++ b/engines/cryo/eden.cpp
@@ -1145,27 +1145,27 @@ void EdenGame::noclipax(int16 index, int16 x, int16 y) {
scr += 128 + 1;
ww -= 128 + 1;
} else {
- byte run;
+ byte runVal;
*scr++ = fill; //TODO: wha?
*scr++ = fill;
ww -= 128 + 1;
- for (run = 127; run--;)
+ for (runVal = 127; runVal--;)
*scr++ = fill;
}
} else {
byte fill = *pix++;
- byte run = 255 - c + 2;
- ww -= run;
+ byte runVal = 255 - c + 2;
+ ww -= runVal;
if (fill == 0)
- scr += run;
+ scr += runVal;
else
- for (; run--;)
+ for (; runVal--;)
*scr++ = fill;
}
} else {
- byte run = c + 1;
- ww -= run;
- for (; run--;) {
+ byte runVal = c + 1;
+ ww -= runVal;
+ for (; runVal--;) {
byte p = *pix++;
if (p == 0)
scr++;
@@ -1220,23 +1220,23 @@ void EdenGame::noclipax_avecnoir(int16 index, int16 x, int16 y) {
if (c >= 0x80) {
if (c == 0x80) {
byte fill = *pix++;
- byte run;
+ byte runVal;
*scr++ = fill; //TODO: wha?
*scr++ = fill;
ww -= 128 + 1;
- for (run = 127; run--;)
+ for (runVal = 127; runVal--;)
*scr++ = fill;
} else {
byte fill = *pix++;
- byte run = 255 - c + 2;
- ww -= run;
- for (; run--;)
+ byte runVal = 255 - c + 2;
+ ww -= runVal;
+ for (; runVal--;)
*scr++ = fill;
}
} else {
- byte run = c + 1;
- ww -= run;
- for (; run--;) {
+ byte runVal = c + 1;
+ ww -= runVal;
+ for (; runVal--;) {
byte p = *pix++;
*scr++ = p;
}
@@ -1407,28 +1407,28 @@ void EdenGame::spriteOnSubtitle(int16 index, int16 x, int16 y) {
scr += 128 + 1;
ww -= 128 + 1;
} else {
- byte run;
+ byte runVal;
*scr++ = fill; //TODO: wha?
*scr++ = fill;
ww -= 128 + 1;
- for (run = 127; run--;)
+ for (runVal = 127; runVal--;)
*scr++ = fill;
}
} else {
byte fill = *pix++;
- byte run = 255 - c + 2;
- ww -= run;
+ byte runVal = 255 - c + 2;
+ ww -= runVal;
if (fill == 0)
- scr += run;
+ scr += runVal;
else {
- for (; run--;)
+ for (; runVal--;)
*scr++ = fill;
}
}
} else {
- byte run = c + 1;
- ww -= run;
- for (; run--;) {
+ byte runVal = c + 1;
+ ww -= runVal;
+ for (; runVal--;) {
byte p = *pix++;
if (p == 0)
scr++;
@@ -2482,28 +2482,28 @@ void EdenGame::displayImage() {
scr += 128 + 1;
ww -= 128 + 1;
} else {
- byte run;
+ byte runVal;
*scr++ = fill; //TODO: wha?
*scr++ = fill;
ww -= 128 + 1;
- for (run = 127; run--;)
+ for (runVal = 127; runVal--;)
*scr++ = fill;
}
} else {
byte fill = *pix++;
- byte run = 255 - c + 2;
- ww -= run;
+ byte runVal = 255 - c + 2;
+ ww -= runVal;
if (fill == 0)
- scr += run;
+ scr += runVal;
else {
- for (; run--;)
+ for (; runVal--;)
*scr++ = fill;
}
}
} else {
- byte run = c + 1;
- ww -= run;
- for (; run--;) {
+ byte runVal = c + 1;
+ ww -= runVal;
+ for (; runVal--;) {
byte p = *pix++;
if (p == 0)
scr++;
More information about the Scummvm-git-logs
mailing list