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

[sev-]

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

Summary:
1158b00dad SCI: Correct spelling mistakes
71f19b0714 ULTIMA: Remove superflous space
8369d0f5e7 SCUMM: Avoid UBSan warning in drawBomp()
dd3f1911e7 DIRECTOR: Fix missing titles, remove duplicate


Commit: 1158b00dad305720d1a2c44eec93e6b63b571414
    https://github.com/scummvm/scummvm/commit/1158b00dad305720d1a2c44eec93e6b63b571414
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-11-01T23:46:28+01:00

Commit Message:
SCI: Correct spelling mistakes

accomodate -> accommodate
firey -> fiery

Changed paths:
    engines/sci/engine/script_patches.cpp


diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index c6fbe3194d6..2454b564bdc 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -4221,7 +4221,7 @@ static const uint16 gk2InventoryScrollSpeedPatch[] = {
 //  up by 1 pixel. This patch fixes the send to scrollSelections by passing the
 //  button's delta instead of 1. The Italian version's vocab.997 is missing the
 //  scrollSelections selector so this patch avoids referencing it. Two versions
-//  are necessary to accomodate scripts compiled with and without line numbers.
+//  are necessary to accommodate scripts compiled with and without line numbers.
 //
 // Applies to: All versions
 // Responsible method: ScrollButon:track
@@ -6462,7 +6462,7 @@ static const uint16 kq6CDPatchAudioTextSupportAzureAriel[] = {
 };
 
 // Fixes Alexander's yell in dual mode when the Minotaur knocks him into the
-//  firey pit in room 440.
+//  fiery pit in room 440.
 //
 // Applies to: PC-CD
 // Patched method: hornSwaggled:changeState


Commit: 71f19b0714a0cbf5dc521fbcfab24ee3aeb57414
    https://github.com/scummvm/scummvm/commit/71f19b0714a0cbf5dc521fbcfab24ee3aeb57414
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-11-01T23:46:31+01:00

Commit Message:
ULTIMA: Remove superflous space

Changed paths:
    engines/ultima/ultima8/world/item_selection_process.h


diff --git a/engines/ultima/ultima8/world/item_selection_process.h b/engines/ultima/ultima8/world/item_selection_process.h
index 26ff99d2a5d..74b92583d62 100644
--- a/engines/ultima/ultima8/world/item_selection_process.h
+++ b/engines/ultima/ultima8/world/item_selection_process.h
@@ -42,7 +42,7 @@ public:
 
 	void run() override;
 
-	//! Select the next item.  If grab is true, pick up loose items now.
+	//! Select the next item. If grab is true, pick up loose items now.
 	bool selectNextItem(bool grab);
 
 	//! Clear the selector sprite


Commit: 8369d0f5e7565067fc095a1badae6daa67fed3d5
    https://github.com/scummvm/scummvm/commit/8369d0f5e7565067fc095a1badae6daa67fed3d5
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-01T23:46:31+01:00

Commit Message:
SCUMM: Avoid UBSan warning in drawBomp()

Only change `mask` if `bd.maskPtr` is non-null, as done everywhere else
in that function.

Changed paths:
    engines/scumm/bomp.cpp


diff --git a/engines/scumm/bomp.cpp b/engines/scumm/bomp.cpp
index bf6018d25a3..e741559dfe8 100644
--- a/engines/scumm/bomp.cpp
+++ b/engines/scumm/bomp.cpp
@@ -325,7 +325,8 @@ void drawBomp(const BompDrawData &bd) {
 
 		// Advance to the next line
 		pos_y++;
-		mask += bd.numStrips;
+		if (bd.maskPtr)
+			mask += bd.numStrips;
 		dst += bd.dst.pitch;
 	}
 }


Commit: dd3f1911e7f436d5647eaa6c2b5c6f9fd5edd472
    https://github.com/scummvm/scummvm/commit/dd3f1911e7f436d5647eaa6c2b5c6f9fd5edd472
Author: Walter Agazzi (tag2015 at gmail.com)
Date: 2022-11-01T23:46:31+01:00

Commit Message:
DIRECTOR: Fix missing titles, remove duplicate

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index d40ceaf8d20..1f84d73b8c9 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -59,6 +59,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "artofmagic",			"Learn the Art of Magic with Jay Alexander" },
 	{ "artrageous",			"ArtRageous!" },
 	{ "artus1",				"Artus against the Demon of the Museum" },
+	{ "atbat",				"At Bat" },
 	{ "atvrally",			"ATV Rally" },
 	{ "babarcoins",			"Babar and the Royal Coin Caper" },
 	{ "babesintoyland",		"Babes in Toyland: An Interactive Adventure" },
@@ -448,7 +449,6 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "wiggles1",			"A Day with the Wiggles" },
 	{ "winniewitch",		"Winnie the Witch" },
 	{ "wishbone", 			"Wishbone and the Amazing Odyssey" },
-	{ "wolfgang",			"Wolfgang the Cyberwolf" }, // According to developer Ugo Guidolin, an English version exists
 	{ "wrath",				"Wrath of the Gods" },
 	{ "xanthus",			"Xanthus" },
 	{ "xfools",				"The X-Fools: The Spoof is Out There" },
@@ -562,6 +562,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "mysteriousegypt",	"Mysterious Egypt" }, // aka Voyage in Egypt
 	{ "newslinks",			"ABC NewsLinks" },
 	{ "nia4",				"News in Action 4" },
+	{ "nightsky",			"Night Sky" },
 	{ "nixon",				"Nixon: Watergate" },
 	{ "nmm",				"Nine Month Miracle" },
 	{ "nobel100",			"The Nobel Prize: 100 Years of Creativity and Innovation" },
@@ -822,7 +823,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "lunes",				"I Lunes e la sfera di Lasifer" },					// Lunes & the sphere of Lasifer
 	{ "magicanti",			"I Magicanti e i 3 elementi" },						// The Magicanti & the 3 elements
 	{ "robidoc",			"Robi & Doc: L'isola della Scienza" },
-	{ "wolfgang",			"Wolfgang il Cyberlupo" },
+	{ "wolfgang",			"Wolfgang il Cyberlupo" },  // According to developer Ugo Guidolin, an English version exists ?
 
 	// Japanese games
 	{ "4sight",				"four-sight" },
@@ -1393,6 +1394,7 @@ static const PlainGameDescriptor directorGames[] = {
 	{ "geoquery",			"Odesta GeoQuery" },
 	{ "greeneggs",			"Green Eggs and Ham" },
 	{ "hollywoodhigh",		"Hollywood High" },
+	{ "hoyle5",				"Hoyle Classic Games" },
 	{ "hyperblade",			"HyperBlade" },
 	{ "ideacomm",			"IDEAcomm Mac" },
 	{ "iliad",				"Iliad" },