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

[a-yyg]

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:
b45d6ce6a8 SAGA2: Fix more uninitialized fields in objects.h


Commit: b45d6ce6a832793c841d6a5be2b92a1ed6e1a478
    https://github.com/scummvm/scummvm/commit/b45d6ce6a832793c841d6a5be2b92a1ed6e1a478
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-04T04:58:22+09:00

Commit Message:
SAGA2: Fix more uninitialized fields in objects.h

Changed paths:
    engines/saga2/objects.cpp
    engines/saga2/objects.h


diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 18b5ba310f..0e55d3c827 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -3319,7 +3319,7 @@ void loadActiveRegions(SaveFileReader &saveGame) {
 //	Constructor
 
 SectorRegionObjectIterator::SectorRegionObjectIterator(GameWorld *world) :
-	searchWorld(world) {
+	searchWorld(world), _currentObject(nullptr) {
 	assert(searchWorld != nullptr);
 	assert(isWorld(searchWorld));
 
diff --git a/engines/saga2/objects.h b/engines/saga2/objects.h
index 3432c1f8c8..78a0b6b84b 100644
--- a/engines/saga2/objects.h
+++ b/engines/saga2/objects.h
@@ -925,7 +925,8 @@ public:
 	    const TileRegion    &sectorRegion) :
 		searchWorld(world),
 		minSector(sectorRegion.min),
-		maxSector(sectorRegion.max) {
+		maxSector(sectorRegion.max),
+		_currentObject(nullptr) {
 		assert(searchWorld != NULL);
 		assert(isWorld(searchWorld));
 	}
@@ -1212,7 +1213,7 @@ class ActiveRegionObjectIterator : public ObjectIterator {
 
 public:
 	//  Constructor
-	ActiveRegionObjectIterator(void) : activeRegionIndex(-1) {}
+	ActiveRegionObjectIterator(void) : activeRegionIndex(-1), sectorBitMask(0), currentWorld(nullptr), _currentObject(nullptr) {}
 
 	//  Iteration functions
 	ObjectID first(GameObject **obj);
@@ -1271,8 +1272,7 @@ class RecursiveContainerIterator {
 public:
 	//  Constructor
 	RecursiveContainerIterator(GameObject *container) :
-		root(container->thisID()) {
-	}
+		root(container->thisID()), id(0) {}
 
 	//  Iteration functions
 	ObjectID first(GameObject **obj);