diff options
| author | Paul Gilbert | 2012-10-22 23:28:54 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-22 23:28:54 +1100 |
| commit | 434d946849e2bb559fe9e391859348affa6618f3 (patch) | |
| tree | 2ecf53b37553a72f76c5d32264d38e3d197473d3 /engines | |
| parent | dc358dab61b726e74818f15e9e3f2b04974487d5 (diff) | |
| download | scummvm-rg350-434d946849e2bb559fe9e391859348affa6618f3.tar.gz scummvm-rg350-434d946849e2bb559fe9e391859348affa6618f3.tar.bz2 scummvm-rg350-434d946849e2bb559fe9e391859348affa6618f3.zip | |
HOPKINS: Fix gcc identified warnings in lines.cpp
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hopkins/graphics.cpp | 12 | ||||
| -rw-r--r-- | engines/hopkins/lines.cpp | 20 |
2 files changed, 16 insertions, 16 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 17cf8714cc..2ec58a0899 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -1274,13 +1274,13 @@ void GraphicsManager::Copy_Video_Vbe16a(const byte *srcData) { v4 = *v3; if (*v3 < 0xFCu) goto Video_Cont_Vbe16a; - if (v4 == -4) + if (v4 == (byte)-4) return; - if (v4 == -3) { + if (v4 == (byte)-3) { v2 += *(v3 + 1); v4 = *(v3 + 2); v3 += 2; - } else if (v4 == -2) { + } else if (v4 == (byte)-2) { v2 += READ_LE_UINT16(v3 + 1); v4 = *(v3 + 3); v3 += 3; @@ -2473,13 +2473,13 @@ void GraphicsManager::Copy_Video_Vbe(const byte *src) { byteVal = *srcP; if (*srcP < 0xFCu) goto Video_Cont_Vbe; - if (byteVal == -4) + if (byteVal == (byte)-4) return; - if (byteVal == -3) { + if (byteVal == (byte)-3) { destOffset += *(srcP + 1); byteVal = *(srcP + 2); srcP += 2; - } else if (byteVal == -2) { + } else if (byteVal == (byte)-2) { destOffset += (int16)READ_LE_UINT16(srcP + 1); byteVal = *(srcP + 3); srcP += 3; diff --git a/engines/hopkins/lines.cpp b/engines/hopkins/lines.cpp index 500a7e590b..5e4e2a5b93 100644 --- a/engines/hopkins/lines.cpp +++ b/engines/hopkins/lines.cpp @@ -2679,19 +2679,19 @@ LABEL_150: if (v90 - a4 < 0) v11 = -v11; v107 = v11 + 1; - if (v10 > (signed __int16)(v11 + 1)) + if (v10 > (int16)(v11 + 1)) v107 = v10; v12 = v107 - 1; v101 = 1000 * v10 / v12; - v99 = 1000 * (signed __int16)(v11 + 1) / v12; + v99 = 1000 * (int16)(v11 + 1) / v12; if (a3 < v7) v101 = -v101; if (a4 < v90) v99 = -v99; - v13 = (signed __int16)v101 / 1000; - v94 = (signed __int16)v99 / 1000; + v13 = (int16)v101 / 1000; + v94 = (int16)v99 / 1000; v91 = -1; - if ((signed __int16)v99 / 1000 == -1 && (unsigned int)v101 <= 0x96) + if ((int16)v99 / 1000 == -1 && (unsigned int)v101 <= 0x96) v91 = 1; if (v13 == 1) { if ((unsigned int)(v99 + 1) <= 0x97) @@ -2724,24 +2724,24 @@ LABEL_72: if (v95 < 0) v95 = -(v109 - a4); v108 = v95 + 1; - if (v20 > (signed __int16)(v95 + 1)) + if (v20 > (int16)(v95 + 1)) v108 = v20; if (v108 <= 10) goto LABEL_149; v21 = v108 - 1; v102 = 1000 * v20 / v21; - v100 = 1000 * (signed __int16)(v95 + 1) / v21; + v100 = 1000 * (int16)(v95 + 1) / v21; if (a3 < v111) v102 = -v102; if (a4 < v109) v100 = -v100; - v22 = (signed __int16)v102 / 1000; - v96 = (signed __int16)v100 / 1000; + v22 = (int16)v102 / 1000; + v96 = (int16)v100 / 1000; v106 = 1000 * v111; v105 = 1000 * v109; v104 = 1000 * v111 / 1000; v103 = v105 / 1000; - if (!((signed __int16)v102 / 1000) && v96 == -1) + if (!((int16)v102 / 1000) && v96 == -1) v91 = 1; if (v22 == 1) { if (v96 == -1) |