[Scummvm-git-logs] scummvm master -> 5e440cb58eb035cade26f98e66005788ad90c1de

[sev-]

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:
5e440cb58e FREESCAPE: Fix compilation


Commit: 5e440cb58eb035cade26f98e66005788ad90c1de
    https://github.com/scummvm/scummvm/commit/5e440cb58eb035cade26f98e66005788ad90c1de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-03-14T19:42:39+01:00

Commit Message:
FREESCAPE: Fix compilation

Changed paths:
    engines/freescape/sound.cpp


diff --git a/engines/freescape/sound.cpp b/engines/freescape/sound.cpp
index 278190960e0..c6fbb930641 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -171,7 +171,7 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 					//	cVar3 = cVar3 + -1;
 					//} while (cVar3 != '\0');
 
-					//uint8 bVar9 = (byte)((ushort)sVar7);
+					//uint8 bVar9 = (byte)((uint16)sVar7);
 					//bVar4 = bVar9;
 					//do {
 					//	bVar4 = bVar4 - 1;
@@ -189,7 +189,7 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 						silenceSize = soundSize;
 
 					//debug("soundSize: %x", soundSize);
-					//sVar7 = (ushort)bVar9 << 8;
+					//sVar7 = (uint16)bVar9 << 8;
 				} while (repetitions != 0);
 				//debug("\n");
 				//if (i == 15)
@@ -206,10 +206,10 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 						//ULA_PORT = bVar4;
 						//bVar4 = bVar4 ^ 0x10;
 						beep = !beep;
-						repetitions = (((ushort)soundType * 0x100 + (ushort)soundType * -2) -
-									(ushort)((ushort)soundType * 0x100 < (ushort)soundType)) + (uVar2 & 0xff);
+						repetitions = (((uint16)soundType * 0x100 + (uint16)soundType * -2) -
+									(uint16)((uint16)soundType * 0x100 < (uint16)soundType)) + (uVar2 & 0xff);
 						uint8 bVar9 = (byte)repetitions;
-						uint8 bVar8 = (byte)((ushort)repetitions >> 8);
+						uint8 bVar8 = (byte)((uint16)repetitions >> 8);
 						uint8 bVar1 = bVar9 - bVar8;
 						soundType = bVar1;
 						if (bVar8 <= bVar9) {