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

[mduggan]

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:
ef75bf7404 ICB: More tweaks to types to fix amigaos4 build


Commit: ef75bf740405969863aad16f8173a05b68e47684
    https://github.com/scummvm/scummvm/commit/ef75bf740405969863aad16f8173a05b68e47684
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-12-27T14:08:21+09:00

Commit Message:
ICB: More tweaks to types to fix amigaos4 build

This should be a safe change, but I'm not totally familiar with the engine - I
tried the demo but it crashes quite soon into the game.  I also tried before
commit 8aac0d, bit that also crashes quite soon into the game, so at least not
worse than before..

Changed paths:
    engines/icb/common/px_game_object.h


diff --git a/engines/icb/common/px_game_object.h b/engines/icb/common/px_game_object.h
index 0cbfc4383b..2b5b4b3a4d 100644
--- a/engines/icb/common/px_game_object.h
+++ b/engines/icb/common/px_game_object.h
@@ -179,7 +179,7 @@ inline void c_un_game_object::SetIntegerVariable(uint32 lvar, int32 val) {
 inline int32 &c_un_game_object::GetIntegerVariable(uint32 lvar) {
 	// Get an lvar value
 	_ASSERT((lvar >= 0) && (lvar < m_noLvars));
-	return (((int *)(((char *)this) + m_lvars_offset))[lvar]);
+	return (((int32 *)(((char *)this) + m_lvars_offset))[lvar]);
 }
 
 inline cstr c_un_game_object::GetStringVariable(uint32 lvar) const {
@@ -336,7 +336,7 @@ inline void c_compressed_game_object::SetIntegerVariable(uint32 lvar, int32 val)
 inline int32 &c_compressed_game_object::GetIntegerVariable(uint32 lvar) {
 	// Get an lvar value
 	_ASSERT((lvar >= 0) && (lvar < m_noLvars));
-	return (((int *)(((char *)this) + m_lvars_offset))[lvar]);
+	return (((int32 *)(((char *)this) + m_lvars_offset))[lvar]);
 }
 
 inline cstr c_compressed_game_object::GetStringVariable(uint32 lvar) const {