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

[sev-]

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

Summary:
61e7929bb1 FREESCAPE: Fix compilation
b673fbee22 JANITORIAL: Remove trailing spaces


Commit: 61e7929bb1d1cd25143f3d55a0937d9e90090d6f
    https://github.com/scummvm/scummvm/commit/61e7929bb1d1cd25143f3d55a0937d9e90090d6f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-03-09T09:08:36+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 318bc838a22..0c9122e7bb9 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -135,7 +135,7 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 						repetitions = repetitions - 1;
 						var5 = var5 + (SFXtempStruct[5] | (SFXtempStruct[6] << 8)); 
 
-					} while ((byte)((byte)repetitions | (byte)((ushort)repetitions >> 8)) != 0);
+					} while ((byte)((byte)repetitions | (byte)((uint16)repetitions >> 8)) != 0);
 					soundSize = soundSize - 1;
 					repetitions = SFXtempStruct[1] | (SFXtempStruct[2] << 8);
 					var5 = soundValue;


Commit: b673fbee227bbda593c207b453f84a8fe30eefbc
    https://github.com/scummvm/scummvm/commit/b673fbee227bbda593c207b453f84a8fe30eefbc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-03-09T09:08:36+01:00

Commit Message:
JANITORIAL: Remove trailing spaces

Changed paths:
    engines/freescape/sound.cpp


diff --git a/engines/freescape/sound.cpp b/engines/freescape/sound.cpp
index 0c9122e7bb9..beb6a569c63 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -108,7 +108,7 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 				soundSize = SFXtempStruct[0];
 				SFXtempStruct[0] = soundSize - 1;
 				sound_ptr = original_sound_ptr;
-				if ((soundSize - 1) == 0) 
+				if ((soundSize - 1) == 0)
 					break;
 				SFXtempStruct[5] = 0;
 			}
@@ -133,14 +133,14 @@ void FreescapeEngine::loadSpeakerFxZX(Common::SeekableReadStream *file, int sfxT
 						//debug("playSFX(%x, %x)", soundUnit.freqTimesSeconds, soundUnit.tStates);
 						_soundsSpeakerFxZX[i]->push_back(soundUnit);
 						repetitions = repetitions - 1;
-						var5 = var5 + (SFXtempStruct[5] | (SFXtempStruct[6] << 8)); 
+						var5 = var5 + (SFXtempStruct[5] | (SFXtempStruct[6] << 8));
 
 					} while ((byte)((byte)repetitions | (byte)((uint16)repetitions >> 8)) != 0);
 					soundSize = soundSize - 1;
 					repetitions = SFXtempStruct[1] | (SFXtempStruct[2] << 8);
 					var5 = soundValue;
 				} while (soundSize != 0);
-			} else if ((soundType & 0x7f) == 2) { 
+			} else if ((soundType & 0x7f) == 2) {
 				int size = 2 * (SFXtempStruct[1] + SFXtempStruct[2]);
 
 				soundUnitZX soundUnit;