[Scummvm-git-logs] scummvm master -> 94ce25ac0cc188ad337d1889ddbe4440bd67aff7

[dwatteau]

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:
94ce25ac0c SKY: Fix AmigaOS and NDS builds


Commit: 94ce25ac0cc188ad337d1889ddbe4440bd67aff7
    https://github.com/scummvm/scummvm/commit/94ce25ac0cc188ad337d1889ddbe4440bd67aff7
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-29T11:19:20+01:00

Commit Message:
SKY: Fix AmigaOS and NDS builds

Changed paths:
    engines/sky/sky.cpp
    engines/sky/text.h


diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index 7512a64b776..eaa55404fa4 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -360,7 +360,7 @@ bool SkyEngine::loadChineseTraditional() {
 			skyExe.seek(chineseExes[i].stringSectionIndexOffset);
 			for (uint j = 0; j < 8; j++)
 				_chineseTraditionalOffsets[j] = skyExe.readUint32LE() + chineseExes[i].virtualBase;
-			uint stringBlockOffset = _chineseTraditionalOffsets[0];
+			uint32 stringBlockOffset = _chineseTraditionalOffsets[0];
 			for (uint j = 1; j < 8; j++)
 				stringBlockOffset = MIN(_chineseTraditionalOffsets[j], stringBlockOffset);
 			for (uint j = 0; j < 8; j++)
diff --git a/engines/sky/text.h b/engines/sky/text.h
index 42f12f3a242..716313ad3df 100644
--- a/engines/sky/text.h
+++ b/engines/sky/text.h
@@ -49,7 +49,7 @@ public:
 	Text(Disk *skyDisk, SkyCompact *skyCompact);
 	~Text();
 	struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
-	struct DisplayedText displayText(char *textPtr, uint bufLen, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
+	struct DisplayedText displayText(char *textPtr, uint32 bufLen, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
 	struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center);
 	void fnSetFont(uint32 fontNr);
 	void fnTextModule(uint32 textInfoId, uint32 textNo);