[Scummvm-git-logs] scummvm master -> 52c46f0b0385d1f11296a47a5e900385eca2f438

[eriktorbjorn]

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:
fd8ba511fc MADE: Fix error message
52c46f0b03 SCUMM: Adjust slider range for Loom overture timing


Commit: fd8ba511fc04696e98331c9333b48f5f5c4fad35
    https://github.com/scummvm/scummvm/commit/fd8ba511fc04696e98331c9333b48f5f5c4fad35
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-01T14:10:12+01:00

Commit Message:
MADE: Fix error message

Changed paths:
    engines/made/database.cpp


diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index b112773ae44..9356e813088 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -754,7 +754,7 @@ int16 GameDatabaseV3::loadgame(const char *filename, int16 version) {
 int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag) {
 	Object *obj = getObject(objectIndex);
 	if (obj->getClass() >= 0x7FFE) {
-		error("GameDatabaseV2::findObjectProperty(%04X, %04X) Not an object", objectIndex, propertyId);
+		error("GameDatabaseV3::findObjectProperty(%04X, %04X) Not an object", objectIndex, propertyId);
 	}
 
 	int16 *prop = (int16 *)obj->getData();


Commit: 52c46f0b0385d1f11296a47a5e900385eca2f438
    https://github.com/scummvm/scummvm/commit/52c46f0b0385d1f11296a47a5e900385eca2f438
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-01T14:53:06+01:00

Commit Message:
SCUMM: Adjust slider range for Loom overture timing

After checking a number of different recordings, I've decided that in
order to cover most sensible ones (I'm not going to cater to some
ridiculously slow guitar version!), I really need a range of about 1:40
- 2:50. Apparently the Ozawa version is one of the faster ones.

This is larger than I had hoped for, but you should still have pretty
good control over it at sensible screen resolutions.

Changed paths:
    engines/scumm/dialogs.cpp


diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6dd9f83f78e..e4f8d634cdc 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -707,13 +707,17 @@ EgaLoomOptionsWidget::EgaLoomOptionsWidget(GuiObject *boss, const Common::String
 
 	_overtureTicksSlider = new GUI::SliderWidget(widgetsBoss(), "EgaLoomOptionsDialog.OvertureTicks", _("When using replacement music, this adjusts the time when the Overture changes to the scene with the Lucasfilm and Loom logotypes."), kOvertureTicksChanged);
 
-	// This allows the transition in the Loom Overture to be changed by
-	// 20 seconds in each direction. I think it's nice if the interval is
-	// small enough that you can set the slider back to default at any
-	// reasonable screen resolution.
-
-	_overtureTicksSlider->setMinValue(-200);
-	_overtureTicksSlider->setMaxValue(200);
+	// In the Ozawa recording, the transition happens at about 1:56. At is
+	// turns out, this is a fairly fast version of the tune. After checking
+	// a number of different recordings, I've settled on an interval of
+	// 1:40 - 2:50. This is larger than I had hoped, but I guess it's
+	// really necessary.
+	//
+	// Hopefully that still means you can set the slider back to its default
+	// value at most reasonable screen resolutions.
+
+	_overtureTicksSlider->setMinValue(-160);
+	_overtureTicksSlider->setMaxValue(540);
 
 	_overtureTicksLabel = new GUI::StaticTextWidget(widgetsBoss(), "EgaLoomOptionsDialog.OvertureTicksLabel", Common::U32String());