[Scummvm-git-logs] scummvm branch-2-9 -> 8f75fe0ec13063f2f754111c01937280eaf7be9b

[bluegr]

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:
1aef8d08b8 SAGA: Remove outdated comment, related to Adlib instrument files
8f75fe0ec1 SCUMM: HE: Fix Duplicated Semicolons Causing GCC Compiler Warnings


Commit: 1aef8d08b8e66114988489753f7863d93566c9ff
    https://github.com/scummvm/scummvm/commit/1aef8d08b8e66114988489753f7863d93566c9ff
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-17T03:57:39+02:00

Commit Message:
SAGA: Remove outdated comment, related to Adlib instrument files

When that comment was written, there wasn't any support for the
instrument definition files of the Miles Sound System used with IHNM

Changed paths:
    engines/saga/music.cpp


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 1f2ca1e386e..c6b28206a56 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -150,31 +150,6 @@ Music::Music(SagaEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer), _par
 		if (_vm->getGameId() == GID_ITE) {
 			_musicContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
 		} else if (_vm->getGameId() == GID_IHNM) {
-			// I've listened to music from both the FM and the GM
-			// file, and I've tentatively reached the conclusion
-			// that they are both General MIDI. My guess is that
-			// the FM file has been reorchestrated to sound better
-			// on AdLib and other FM synths.
-			//
-			// Sev says the AdLib music does not sound like in the
-			// original, but I still think assuming General MIDI is
-			// the right thing to do. Some music, like the End
-			// Title (song 0) sound absolutely atrocious when piped
-			// through our MT-32 to GM mapping.
-			//
-			// It is, however, quite possible that the original
-			// used a different GM to FM mapping. If the original
-			// sounded markedly better, perhaps we should add some
-			// way of replacing our stock mapping in adlib.cpp?
-			//
-			// For the composer's own recording of the End Title,
-			// see http://www.johnottman.com/
-
-			// Oddly enough, the intro music (song 1) is very
-			// different in the two files. I have no idea why.
-			// Note that the IHNM demo has only got one music file
-			// (music.rsc). It is assumed that it contains FM music
-
 			// TODO If program flow gets here, this getContext call previously
 			// returned null...
 			_musicContext = _vm->_resource->getContext(GAME_MUSICFILE_FM);


Commit: 8f75fe0ec13063f2f754111c01937280eaf7be9b
    https://github.com/scummvm/scummvm/commit/8f75fe0ec13063f2f754111c01937280eaf7be9b
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-17T03:57:40+02:00

Commit Message:
SCUMM: HE: Fix Duplicated Semicolons Causing GCC Compiler Warnings

These are emitted if -Wpedantic is passed to GCC.

Changed paths:
    engines/scumm/he/moonbase/map_katton.h
    engines/scumm/he/moonbase/map_spiff.h


diff --git a/engines/scumm/he/moonbase/map_katton.h b/engines/scumm/he/moonbase/map_katton.h
index 02899bdffd8..72887768b9e 100644
--- a/engines/scumm/he/moonbase/map_katton.h
+++ b/engines/scumm/he/moonbase/map_katton.h
@@ -43,9 +43,9 @@ private:
 
 	int _size = 0; // 32, 40, 48, or 56
 	int _tileset = 0;
-	int _startloc[20][2] = { {}, {} };;
+	int _startloc[20][2] = { {}, {} };
 	int _board[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };
-	int _special[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };;
+	int _special[MAX_TILE_COUNT][MAX_TILE_COUNT] = { {}, {} };
 
 	int getRandomNumber();
 
diff --git a/engines/scumm/he/moonbase/map_spiff.h b/engines/scumm/he/moonbase/map_spiff.h
index 881ecd220b7..1148cefd56c 100644
--- a/engines/scumm/he/moonbase/map_spiff.h
+++ b/engines/scumm/he/moonbase/map_spiff.h
@@ -77,8 +77,8 @@ private:
 
 	int _mapCornerMaxG = 0; // size of random section
 	int _mapMiddleMaxG = 0;
-	int _mapCorner[MAXSIZE+1][MAXSIZE+1] = { {}, {} };;
-	int _mapMiddle[MAXSIZE][MAXSIZE] = { {}, {} };;
+	int _mapCorner[MAXSIZE+1][MAXSIZE+1] = { {}, {} };
+	int _mapMiddle[MAXSIZE][MAXSIZE] = { {}, {} };
 
 	float getRandomFloat();
 	int spiffRand(int min, int max);