[Scummvm-git-logs] scummvm master -> cda348f8857271a1c66d299d0bb4532cbcbefe44

[ccawley2011]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cda348f885 ICB: Fix compilation on AmigaOS 4


Commit: cda348f8857271a1c66d299d0bb4532cbcbefe44
    https://github.com/scummvm/scummvm/commit/cda348f8857271a1c66d299d0bb4532cbcbefe44
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-12-27T12:02:44Z

Commit Message:
ICB: Fix compilation on AmigaOS 4

Changed paths:
    engines/icb/common/px_scriptengine.cpp
    engines/icb/set_pc.cpp


diff --git a/engines/icb/common/px_scriptengine.cpp b/engines/icb/common/px_scriptengine.cpp
index f0fbd79324..93863e8d7d 100644
--- a/engines/icb/common/px_scriptengine.cpp
+++ b/engines/icb/common/px_scriptengine.cpp
@@ -42,7 +42,7 @@ CpxGlobalScriptVariables g_globalScriptVariables;
 
 // Information for the script program stack
 #define STACK_SIZE 10  // The size of the stack
-int stack[STACK_SIZE]; // The current stack
+int32 stack[STACK_SIZE]; // The current stack
 int stackPointer = 0;  // Position within stack
 
 #define _SCRIPT_ENGINE_ERROR(mess) Fatal_error("Script engine error\nObject %s\nScript %s\nMessage %s", object->GetName(), scriptSourceName, mess)
diff --git a/engines/icb/set_pc.cpp b/engines/icb/set_pc.cpp
index 3fd7130cc7..2ddc51bdc1 100644
--- a/engines/icb/set_pc.cpp
+++ b/engines/icb/set_pc.cpp
@@ -708,7 +708,7 @@ void _set::Init_base_bitmap_buffers() {
 	decoder.ReadImage(ptr, bg_buffer_id);
 
 	// find the start of the weather data
-	int32 *weatherPtr = (int *)(bgPtr + shadowTable[1]);
+	int32 *weatherPtr = (int32 *)(bgPtr + shadowTable[1]);
 
 	InitWeather(*(weatherPtr), *(weatherPtr + 1), *(weatherPtr + 2), *(weatherPtr + 3), *(weatherPtr + 4), *(weatherPtr + 5));