[Scummvm-git-logs] scummvm master -> 05a2b67b20205be9e07e0e4f6a1cfe96b47a7c32

[dreammaster]

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:
19511961e4 ULTIMA4: Allow britain as an alias for britannia in goto cheat
05a2b67b20 ULTIMA4: Fix assert in ranged creature attacks check


Commit: 19511961e44433ae2ebb2ff4befe65b36798ba62
    https://github.com/scummvm/scummvm/commit/19511961e44433ae2ebb2ff4befe65b36798ba62
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-15T21:33:09-07:00

Commit Message:
ULTIMA4: Allow britain as an alias for britannia in goto cheat

Changed paths:
    engines/ultima/ultima4/core/debugger.cpp


diff --git a/engines/ultima/ultima4/core/debugger.cpp b/engines/ultima/ultima4/core/debugger.cpp
index 125f0ff2ba..a43fdb53e5 100644
--- a/engines/ultima/ultima4/core/debugger.cpp
+++ b/engines/ultima/ultima4/core/debugger.cpp
@@ -1400,6 +1400,8 @@ bool Debugger::cmdGoto(int argc, const char **argv) {
 	}
 
 	dest.toLowercase();
+	if (dest == "britain")
+		dest = "britannia";
 
 	bool found = false;
 	p = strToInt(dest.c_str());


Commit: 05a2b67b20205be9e07e0e4f6a1cfe96b47a7c32
    https://github.com/scummvm/scummvm/commit/05a2b67b20205be9e07e0e4f6a1cfe96b47a7c32
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-15T21:33:09-07:00

Commit Message:
ULTIMA4: Fix assert in ranged creature attacks check

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 9fea1ae2fd..9dfd8a3765 100644
--- a/engines/ultima/ultima4/game/game.cpp
+++ b/engines/ultima/ultima4/game/game.cpp
@@ -447,7 +447,6 @@ bool creatureRangeAttack(const Coords &coords, Creature *m) {
 	// See if the attack hits the avatar
 	Object *obj = g_context->_location->_map->objectAt(coords);
 	m = dynamic_cast<Creature *>(obj);
-	assert(m);
 
 	// Does the attack hit the avatar?
 	if (coords == g_context->_location->_coords) {
@@ -464,7 +463,7 @@ bool creatureRangeAttack(const Coords &coords, Creature *m) {
 	}
 	// Destroy objects that were hit
 	else if (obj) {
-		if ((obj->getType() == Object::CREATURE && m->isAttackable()) ||
+		if ((obj->getType() == Object::CREATURE && m && m->isAttackable()) ||
 		        obj->getType() == Object::UNKNOWN) {
 
 			GameController::flashTile(coords, tile, 3);