diff options
| author | Paul Gilbert | 2012-09-30 21:41:47 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-09-30 21:41:47 +1000 |
| commit | 1f87e4836a3fef4317fe5491ba6b075c8ff9c381 (patch) | |
| tree | fc13b418342d2602d5c4a807a61322277c257b06 /engines/hopkins | |
| parent | b34091852c2f2994ac82aeb0e0ace8550508eaaa (diff) | |
| download | scummvm-rg350-1f87e4836a3fef4317fe5491ba6b075c8ff9c381.tar.gz scummvm-rg350-1f87e4836a3fef4317fe5491ba6b075c8ff9c381.tar.bz2 scummvm-rg350-1f87e4836a3fef4317fe5491ba6b075c8ff9c381.zip | |
HOPKINS: Fixed some more castings identified by gcc
Diffstat (limited to 'engines/hopkins')
| -rw-r--r-- | engines/hopkins/graphics.cpp | 6 | ||||
| -rw-r--r-- | engines/hopkins/talk.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 896a393f35..f99b0a1990 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -656,7 +656,7 @@ void GraphicsManager::m_scroll16A(const byte *surface, int xs, int ys, int width Agr_x = 0; do { - v12 = *(uint16 *)(v11 + 2 * *(byte *)v7); + v12 = *(uint16 *)(v11 + 2 * *v7); *(uint16 *)v8 = v12; ++v7; v8 += 2; @@ -1156,11 +1156,11 @@ void GraphicsManager::Copy_Video_Vbe3(const byte *surface) { if (v5 < 251) { v2 += *v4 + 35; v5 = *(v4++ + 1); - } else if (v5 == -3) { + } else if (v5 == (byte)-3) { v2 += *(v4 + 1); v5 = *(v4 + 2); v4 += 2; - } else if (v5 == -2) { + } else if (v5 == (byte)-2) { v2 += READ_LE_UINT16(v4 + 1); v5 = *(v4 + 3); v4 += 3; diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 23ff2ed3ba..07b481f298 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -775,7 +775,7 @@ void TalkManager::CHERCHE_ANIM0(int a1, int a2) { v7 = READ_LE_UINT16(&v8[2 * v6 + 4]); if (v7 && _vm->_globals.vitesse != 501) _vm->_graphicsManager.AFFICHE_SPEED(PERSOSPR, _vm->_eventsManager.start_x + READ_LE_UINT16(&v8[2 * v6]), - READ_LE_UINT16(&v8[2 * v6 + 2]), (unsigned __int8)v9[2 * v6 + 8]); + READ_LE_UINT16(&v8[2 * v6 + 2]), v9[2 * v6 + 8]); v6 += 5; } while (_vm->_globals.vitesse != 501 && v7); } |