diff options
| author | Strangerke | 2013-02-02 12:26:21 +0100 |
|---|---|---|
| committer | Strangerke | 2013-02-02 12:26:21 +0100 |
| commit | 9772426c586c0ac25fd21e9865ac5f2d85217db1 (patch) | |
| tree | ac0e32b402511d6ec7c48bf3e2337bd5f46771b4 | |
| parent | 4b0e2263402a0f80595a6e910359dd4b062817ac (diff) | |
| download | scummvm-rg350-9772426c586c0ac25fd21e9865ac5f2d85217db1.tar.gz scummvm-rg350-9772426c586c0ac25fd21e9865ac5f2d85217db1.tar.bz2 scummvm-rg350-9772426c586c0ac25fd21e9865ac5f2d85217db1.zip | |
HOPKINS: Fix signness issue, get rid of another GOTO
| -rw-r--r-- | engines/hopkins/graphics.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 36febe17ee..bdc2d50cd4 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -1358,8 +1358,7 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp v46 = spritePixelsP; Agr_Flag_x = false; Agr_x = 0; - for (int v35 = zoomedWidth; v35; v35--) { - Agr_Flag_x = false; + for (int v35 = zoomedWidth; v35; Agr_Flag_x = false, v35--) { for (;;) { if (*spritePixelsP) *v29 = *spritePixelsP; @@ -1429,17 +1428,16 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp v60 = zoomedHeight; byte *v51 = dest1P; v45 = spritePixelsP; - int v28 = zoomedWidth; Agr_Flag_x = false; Agr_x = 0; - do { + for (int v28 = zoomedWidth; v28; Agr_Flag_x = false, v28--) { for (;;) { if (*spritePixelsP) *dest1P = *spritePixelsP; ++dest1P; ++spritePixelsP; if (!Agr_Flag_x) - Agr_x = zoom2 + Agr_x; + Agr_x += zoom2; if ((uint16)Agr_x < 100) break; Agr_x = Agr_x - 100; @@ -1447,12 +1445,9 @@ void GraphicsManager::Affiche_Perfect(byte *surface, const byte *srcData, int xp Agr_Flag_x = true; --v28; if (!v28) - goto Aff_Zoom_Larg_Cont1; + break; } - Agr_Flag_x = false; - --v28; - } while (v28); -Aff_Zoom_Larg_Cont1: + } spritePixelsP = _width + v45; dest1P = _lineNbr2 + v51; if (!Agr_Flag_y) @@ -1544,7 +1539,7 @@ Aff_Zoom_Larg_Cont1: dest2P = spriteWidth + dest1P; spec_largeur = spriteWidth; if (_posYClipped) { - if (_posYClipped >= (unsigned int)spriteHeight1) + if (_posYClipped >= spriteHeight1 || spriteHeight1 < 0) return; spritePixelsP += spriteWidth * _posYClipped; dest2P += _lineNbr2 * _posYClipped; @@ -1581,7 +1576,7 @@ Aff_Zoom_Larg_Cont1: } else { spec_largeur = spriteWidth; if (_posYClipped) { - if (_posYClipped >= (unsigned int)spriteHeight1) + if (_posYClipped >= spriteHeight1 || spriteHeight1 < 0) return; spritePixelsP += spriteWidth * _posYClipped; dest1P += _lineNbr2 * _posYClipped; |