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

[mduggan]

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:
a1880b8220 ULTIMA8: Remove text from inventory gump when Crusader dies
764f310f8a ULTIMA8: Crusader camera centre button improvement
014ad8f23a ULTIMA8: Avoid possible assertion on avatar death
a00ec35068 ULTIMA8: Fix Crusader detpac usage.


Commit: a1880b8220212d12f72c00cb115ffb94cd09ccd4
    https://github.com/scummvm/scummvm/commit/a1880b8220212d12f72c00cb115ffb94cd09ccd4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-07T10:56:37+09:00

Commit Message:
ULTIMA8: Remove text from inventory gump when Crusader dies

Changed paths:
    engines/ultima/ultima8/gumps/cru_inventory_gump.cpp


diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
index 4c2deb34a5..5297239269 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -86,6 +86,7 @@ void CruInventoryGump::PaintThis(RenderSurface *surf, int32 lerp_factor, bool sc
 	} else {
 		Item *item = getItem(activeitem);
 		if (!item) {
+			resetText();
 			_inventoryItemGump->SetShape(0, 0);
 		} else {
 			GumpShapeArchive *gumpshapes = GameData::get_instance()->getGumps();


Commit: 764f310f8a715264cdc81ef6978377727885993a
    https://github.com/scummvm/scummvm/commit/764f310f8a715264cdc81ef6978377727885993a
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-07T10:56:37+09:00

Commit Message:
ULTIMA8: Crusader camera centre button improvement

The "centre on avatar" button should use the centre of the avatar, not his
feet.

Changed paths:
    engines/ultima/ultima8/misc/debugger.cpp


diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index e3f4c732e6..85d2036e16 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -1164,7 +1164,7 @@ bool Debugger::cmdCameraOnAvatar(int argc, const char **argv) {
 	Actor *actor = getControlledActor();
 	if (actor) {
 		int32 x, y, z;
-		actor->getLocation(x, y, z);
+		actor->getCentre(x, y, z);
 		CameraProcess::SetCameraProcess(new CameraProcess(x, y, z));
 	}
 	return false;


Commit: 014ad8f23a766dd5d3586a7c443adabc70984aa1
    https://github.com/scummvm/scummvm/commit/014ad8f23a766dd5d3586a7c443adabc70984aa1
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-07T10:56:37+09:00

Commit Message:
ULTIMA8: Avoid possible assertion on avatar death

Changed paths:
    engines/ultima/ultima8/world/egg_hatcher_process.cpp


diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.cpp b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
index 90a078fb93..b4b0bc135a 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.cpp
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.cpp
@@ -51,7 +51,8 @@ void EggHatcherProcess::addEgg(Egg *egg) {
 void EggHatcherProcess::run() {
 	bool nearteleporter = false;
 	MainActor *av = getMainActor();
-	assert(av);
+	if (!av)
+		return;
 
 	// CONSTANTS!
 	const int range_mul = GAME_IS_U8 ? 32 : 64;


Commit: a00ec350685aab6f1c60a4a2b337d2c4972b8b8a
    https://github.com/scummvm/scummvm/commit/a00ec350685aab6f1c60a4a2b337d2c4972b8b8a
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2021-05-07T10:56:37+09:00

Commit Message:
ULTIMA8: Fix Crusader detpac usage.

Changed paths:
    engines/ultima/ultima8/world/actors/main_actor.cpp


diff --git a/engines/ultima/ultima8/world/actors/main_actor.cpp b/engines/ultima/ultima8/world/actors/main_actor.cpp
index e5467b807f..05b9809b0f 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -1019,6 +1019,8 @@ void MainActor::detonateBomb() {
 							0x800, true, _x, _y);
 	for (unsigned int i = 0; i < uclist.getSize(); ++i) {
 		Item *founditem = getItem(uclist.getuint16(i));
+		if (founditem->hasFlags(FLG_CONTAINED))
+			continue;
 		founditem->callUsecodeEvent_use();
 	}
 	return;