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

[mduggan]

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

Summary:
b180580058 ULTIMA8: Fix uninitialized members for coverity


Commit: b180580058d11bec43aec6e78d7d31f4f5a21eb9
    https://github.com/scummvm/scummvm/commit/b180580058d11bec43aec6e78d7d31f4f5a21eb9
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-13T14:28:44+09:00

Commit Message:
ULTIMA8: Fix uninitialized members for coverity

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


diff --git a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
index dc654415e1..bbfc1cf588 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.cpp
@@ -37,12 +37,12 @@ namespace Ultima8 {
 
 DEFINE_RUNTIME_CLASSTYPE_CODE(CruAmmoGump)
 
-CruAmmoGump::CruAmmoGump() : CruStatGump() {
+CruAmmoGump::CruAmmoGump() : CruStatGump(), _clipsText(nullptr), _bulletsText(nullptr) {
 
 }
 
-CruAmmoGump::CruAmmoGump(Shape *shape, int x)
-	: CruStatGump(shape, x), _ammoShape(nullptr) {
+CruAmmoGump::CruAmmoGump(Shape *shape, int x) : CruStatGump(shape, x),
+		_clipsText(nullptr), _bulletsText(nullptr) {
 	_frameNum = 1;
 }
 
diff --git a/engines/ultima/ultima8/gumps/cru_ammo_gump.h b/engines/ultima/ultima8/gumps/cru_ammo_gump.h
index 85bab3fec8..c1f974b57d 100644
--- a/engines/ultima/ultima8/gumps/cru_ammo_gump.h
+++ b/engines/ultima/ultima8/gumps/cru_ammo_gump.h
@@ -52,8 +52,6 @@ public:
 	void saveData(Common::WriteStream *ws) override;
 
 private:
-	Shape *_ammoShape;
-
 	TextWidget *_bulletsText;
 	TextWidget *_clipsText;
 };
diff --git a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
index 437cfe960c..e909a70d0a 100644
--- a/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
+++ b/engines/ultima/ultima8/gumps/cru_inventory_gump.cpp
@@ -41,12 +41,13 @@ static const int INVENTORY_TEXT_FONT = 12;
 
 DEFINE_RUNTIME_CLASSTYPE_CODE(CruInventoryGump)
 CruInventoryGump::CruInventoryGump() : CruStatGump(), _inventoryShape(nullptr),
-	_inventoryItemGump(nullptr) {
+	_inventoryItemGump(nullptr), _inventoryText(nullptr) {
 
 }
 
 CruInventoryGump::CruInventoryGump(Shape *shape, int x)
-	: CruStatGump(shape, x), _inventoryShape(nullptr), _inventoryItemGump(nullptr) {
+	: CruStatGump(shape, x), _inventoryShape(nullptr), _inventoryItemGump(nullptr),
+		_inventoryText(nullptr) {
 	_frameNum = 0;
 }