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

[mduggan]

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:
3666cf9fce ULTIMA8: Initialize all the members
a8baa9b286 ULTIMA8: add defensive null check for firetype
c7a5dfe932 ULTIMA8: Remember shield sprite for most shields


Commit: 3666cf9fce77e937760ab55798794b87cff1072c
    https://github.com/scummvm/scummvm/commit/3666cf9fce77e937760ab55798794b87cff1072c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-08-03T17:52:30+09:00

Commit Message:
ULTIMA8: Initialize all the members

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


diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index 21b1aabad5..2856d80c8d 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -47,7 +47,8 @@ static const uint16 SELECTION_FAILED_SOUND = 0xb0;
 // p_dynamic_cast stuff
 DEFINE_RUNTIME_CLASSTYPE_CODE(ItemSelectionProcess)
 
-ItemSelectionProcess::ItemSelectionProcess() : Process(), _selectedItem(0) {
+ItemSelectionProcess::ItemSelectionProcess() : Process(), _selectedItem(0),
+_ax(0), _ay(0), _az(0) {
 	_instance = this;
 }
 


Commit: a8baa9b2866cd6e39e73e5b8fd5a56646a96da49
    https://github.com/scummvm/scummvm/commit/a8baa9b2866cd6e39e73e5b8fd5a56646a96da49
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-08-03T17:52:30+09:00

Commit Message:
ULTIMA8: add defensive null check for firetype

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


diff --git a/engines/ultima/ultima8/world/super_sprite_process.cpp b/engines/ultima/ultima8/world/super_sprite_process.cpp
index 3232ba342e..3b0d3bfe3b 100644
--- a/engines/ultima/ultima8/world/super_sprite_process.cpp
+++ b/engines/ultima/ultima8/world/super_sprite_process.cpp
@@ -268,6 +268,8 @@ void SuperSpriteProcess::run() {
 
 void SuperSpriteProcess::makeBulletSplash(const Point3 &pt) {
 	const FireType *firetypedat = GameData::get_instance()->getFireType(_fireType);
+	if (!firetypedat)
+		return;
 
 	if (firetypedat->getRange()) {
 		Item *item = getItem(_item0x77);


Commit: c7a5dfe932bd1bc805976bb4285ff891b2df5926
    https://github.com/scummvm/scummvm/commit/c7a5dfe932bd1bc805976bb4285ff891b2df5926
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-08-03T17:52:30+09:00

Commit Message:
ULTIMA8: Remember shield sprite for most shields

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 4793f2ece0..88d37091a4 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.cpp
+++ b/engines/ultima/ultima8/world/actors/main_actor.cpp
@@ -912,7 +912,7 @@ int MainActor::receiveShieldHit(int damage, uint16 damage_type) {
 				getLocation(x, y, z);
 				x += 0x10;
 				y += 0x18;
-				remembersprite = false;
+				remembersprite = true;
 				break;
 			}
 			Process *p = new SpriteProcess(shieldsprite, shieldstartframe,