[Scummvm-git-logs] scummvm master -> 2da650e46b3f56fba229d96829495257a435f7f1

[dreammaster]

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

Summary:
968e2138f4 NUVIE: Added detection for German fan patch
d93a32421a ULTIMA8: Set Ultima Collection detection entries to testing
2da650e46b ULTIMA4: Fix firing frigate cannon


Commit: 968e2138f46902c05b68329090855cbb3b37ae59
    https://github.com/scummvm/scummvm/commit/968e2138f46902c05b68329090855cbb3b37ae59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-24T13:18:43-07:00

Commit Message:
NUVIE: Added detection for German fan patch

Changed paths:
    engines/ultima/detection_tables.h


diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index a70774e13b..d05a4035c3 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -137,6 +137,36 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
 		GF_VGA_ENHANCED
 	},
 
+	// Ultima VI - German Patch https://sirjohn.de/ultima-6/
+	{
+		{
+			"ultima6",
+			0,
+			AD_ENTRY1s("converse.a", "ae979230b97f8813bdf8f82698847435", 198627),
+			Common::DE_DEU,
+			Common::kPlatformDOS,
+			ADGF_TESTING,
+			GUIO0()
+		},
+		GAME_ULTIMA6,
+		0
+	},
+
+	// Ultima VI - German Patch https://sirjohn.de/ultima-6/
+    {
+		{
+			"ultima6_enh",
+			0,
+			AD_ENTRY1s("converse.a", "ae979230b97f8813bdf8f82698847435", 198627),
+			Common::DE_DEU,
+			Common::kPlatformDOS,
+			ADGF_TESTING,
+			GUIO0()
+		},
+		GAME_ULTIMA6,
+		GF_VGA_ENHANCED
+	},
+
 	// PC98 Ultima 6
 	{
 		{


Commit: d93a32421a04bfcb12f8030e2201622f54ce025e
    https://github.com/scummvm/scummvm/commit/d93a32421a04bfcb12f8030e2201622f54ce025e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-24T13:18:51-07:00

Commit Message:
ULTIMA8: Set Ultima Collection detection entries to testing

Changed paths:
    engines/ultima/detection_tables.h


diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index d05a4035c3..00c8342711 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -219,7 +219,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
 			AD_ENTRY1s("fusecode.flx", "4017eb8678ee24af0ce8c7647a05509b", 1300957),
 			Common::FR_FRA,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO1(GUIO_NOMIDI)
 		},
 		GAME_ULTIMA8,
@@ -233,7 +233,7 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
 			AD_ENTRY1s("gusecode.flx", "d69599a46870b66c1b7c02710ed185bd", 1378604),
 			Common::DE_DEU,
 			Common::kPlatformDOS,
-			ADGF_UNSTABLE,
+			ADGF_TESTING,
 			GUIO1(GUIO_NOMIDI)
 		},
 		GAME_ULTIMA8,


Commit: 2da650e46b3f56fba229d96829495257a435f7f1
    https://github.com/scummvm/scummvm/commit/2da650e46b3f56fba229d96829495257a435f7f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-24T13:18:51-07:00

Commit Message:
ULTIMA4: Fix firing frigate cannon

Changed paths:
    engines/ultima/ultima4/game/game.cpp


diff --git a/engines/ultima/ultima4/game/game.cpp b/engines/ultima/ultima4/game/game.cpp
index 9dfd8a3765..66af216ed6 100644
--- a/engines/ultima/ultima4/game/game.cpp
+++ b/engines/ultima/ultima4/game/game.cpp
@@ -244,9 +244,8 @@ bool fireAt(const Coords &coords, bool originAvatar) {
 
 	obj = g_context->_location->_map->objectAt(coords);
 	Creature *m = dynamic_cast<Creature *>(obj);
-	assert(m);
 
-	if (obj && obj->getType() == Object::CREATURE && m->isAttackable())
+	if (obj && obj->getType() == Object::CREATURE && m && m->isAttackable())
 		validObject = true;
 	/* See if it's an object to be destroyed (the avatar cannot destroy the balloon) */
 	else if (obj &&