diff options
| author | Paul Gilbert | 2012-11-13 20:25:55 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-11-13 20:25:55 +1100 |
| commit | db091123ee8f53b0a9cb4ce63f5fee3fc91100fa (patch) | |
| tree | d14eb0c6efd854a2a2c924c6544022972bc94441 | |
| parent | ff9dc4ab248e47c15076dd822b635927f7b27161 (diff) | |
| download | scummvm-rg350-db091123ee8f53b0a9cb4ce63f5fee3fc91100fa.tar.gz scummvm-rg350-db091123ee8f53b0a9cb4ce63f5fee3fc91100fa.tar.bz2 scummvm-rg350-db091123ee8f53b0a9cb4ce63f5fee3fc91100fa.zip | |
HOPKINS: Compilation fixes under gcc
| -rw-r--r-- | engines/hopkins/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/hopkins/hopkins.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 132e8d88ab..a455d35f40 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -360,7 +360,7 @@ void GraphicsManager::A_PCX640_480(byte *surface, const Common::String &file, by // Copy out the palette const byte *palSrc = pcxDecoder.getPalette(); - Common::copy((byte *)palSrc, (byte *)palSrc + PALETTE_BLOCK_SIZE, palette); + Common::copy((const byte *)palSrc, (const byte *)palSrc + PALETTE_BLOCK_SIZE, palette); f.close(); } diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp index 19c59fd24e..13cb092561 100644 --- a/engines/hopkins/hopkins.cpp +++ b/engines/hopkins/hopkins.cpp @@ -919,7 +919,7 @@ LABEL_140: } if (_globals.SORTIE == 31) { _objectsManager.PERSONAGE("IM31", "IM31", "ANIM31", "IM31", 10); - } else if ((unsigned __int16)(_globals.SORTIE - 35) <= 6u) { + } else if ((uint16)(_globals.SORTIE - 35) <= 6u) { _globals.fmusic = 13; _globals.Max_Propre = 50; _globals.Max_Ligne_Long = 40; @@ -1308,7 +1308,7 @@ LABEL_243: _globals.SORTIE = 51; break; default: - if ((unsigned __int16)(_globals.SORTIE - 194) > 5u) { + if ((uint16)(_globals.SORTIE - 194) > 5u) { if (_globals.SORTIE == 151) { _soundManager.WSOUND(16); _globals.iRegul = 1; @@ -2369,11 +2369,11 @@ void HopkinsEngine::Charge_Credits() { char v0; // al@3 int v1; // edx@5 - __int16 v2; // cx@5 + int v2; // cx@5 byte *v3; // ebx@5 char v4; // al@6 - __int16 v5; // cx@14 - __int16 v7; // [sp+10h] [bp-10h]@1 + int v5; // cx@14 + int v7; // [sp+10h] [bp-10h]@1 char v8; // [sp+14h] [bp-Ch]@1 byte *v9; // [sp+18h] [bp-8h]@1 byte *ptr; // [sp+1Ch] [bp-4h]@1 |