diff options
| author | Strangerke | 2017-02-08 16:11:20 +0100 |
|---|---|---|
| committer | Strangerke | 2017-02-08 16:11:20 +0100 |
| commit | c55e8f9544f379d02dfd1bf93217144f04a7abc2 (patch) | |
| tree | 1dcd9ae529aab280c7be7ffa7a0720b51e7fccbb /engines/cryo/eden.cpp | |
| parent | 46260fdf4189d9d644739a64aabc8f93fa108d6f (diff) | |
| download | scummvm-rg350-c55e8f9544f379d02dfd1bf93217144f04a7abc2.tar.gz scummvm-rg350-c55e8f9544f379d02dfd1bf93217144f04a7abc2.tar.bz2 scummvm-rg350-c55e8f9544f379d02dfd1bf93217144f04a7abc2.zip | |
CRYO: Fix some shadowed member
Diffstat (limited to 'engines/cryo/eden.cpp')
| -rw-r--r-- | engines/cryo/eden.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 77d77886b7..2be479922c 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++; |