HOPKINS: Compilation fixes under gcc

scummvm · Nov 13, 2012 · db09112 · db09112
1 parent ff9dc4a
commit db09112
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -919,7 +919,7 @@ bool HopkinsEngine::runLinuxFull() {
 						}
 						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 @@ bool HopkinsEngine::runLinuxFull() {
 														_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