[Scummvm-git-logs] scummvm master -> 270279ad4d5011b9161873974785254487d7a969

[sev-]

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:
6c68acad2d SAGA2: Fix object destruction. CID 1457997
ba743f64fb SAGA2: Implement default constructor for ActiveRegion. CID 1458003
681a75cb60 SAGA2: Properly initialize Location. CID 1457874
270279ad4d SAGA2: Properly implement default constructor for ResourceObjectPrototype. CID 1457943


Commit: 6c68acad2d2f751d07c2c2659acee73bb994145c
    https://github.com/scummvm/scummvm/commit/6c68acad2d2f751d07c2c2659acee73bb994145c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T17:56:33+02:00

Commit Message:
SAGA2: Fix object destruction. CID 1457997

Changed paths:
    engines/saga2/hresmgr.h


diff --git a/engines/saga2/hresmgr.h b/engines/saga2/hresmgr.h
index 9ebb2161ec..84c5d453d2 100644
--- a/engines/saga2/hresmgr.h
+++ b/engines/saga2/hresmgr.h
@@ -117,7 +117,7 @@ public:
 
 	hResContext();
 	hResContext(hResContext *sire, hResID id, const char []);
-	~hResContext();
+	virtual ~hResContext();
 
 	uint32      getResID(void) {
 		return _base->id;
@@ -159,7 +159,7 @@ class hResource : public hResContext {
 
 public:
 	hResource(const char *resname, const char []);
-	~hResource();
+	virtual ~hResource();
 
 	hResContext *newContext(hResID id, const char []);
 	void        disposeContext(hResContext *con);


Commit: ba743f64fb1ffa8ecd0f366d6b2d63c7190a3bfc
    https://github.com/scummvm/scummvm/commit/ba743f64fb1ffa8ecd0f366d6b2d63c7190a3bfc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T17:56:33+02:00

Commit Message:
SAGA2: Implement default constructor for ActiveRegion. CID 1458003

Changed paths:
    engines/saga2/objects.h


diff --git a/engines/saga2/objects.h b/engines/saga2/objects.h
index 0dfee90a80..8198a2245e 100644
--- a/engines/saga2/objects.h
+++ b/engines/saga2/objects.h
@@ -867,6 +867,7 @@ class ActiveRegion {
 
 public:
 
+	ActiveRegion() : anchor(0), worldID(0) {}
 	void update(void);
 
 	//  Return the current region in tile point coords


Commit: 681a75cb609a6bf9aa49067fb546419a830eb27f
    https://github.com/scummvm/scummvm/commit/681a75cb609a6bf9aa49067fb546419a830eb27f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T17:56:33+02:00

Commit Message:
SAGA2: Properly initialize Location. CID 1457874

Changed paths:
    engines/saga2/objproto.h


diff --git a/engines/saga2/objproto.h b/engines/saga2/objproto.h
index 103d1811fc..09aab7941e 100644
--- a/engines/saga2/objproto.h
+++ b/engines/saga2/objproto.h
@@ -128,7 +128,7 @@ public:
 		return *this;
 	}
 
-	Location() {}
+	Location() : context(0) {}
 
 	Location(int16 nu, int16 nv, int16 nz, ObjectID con) {
 		u = nu;


Commit: 270279ad4d5011b9161873974785254487d7a969
    https://github.com/scummvm/scummvm/commit/270279ad4d5011b9161873974785254487d7a969
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T17:56:34+02:00

Commit Message:
SAGA2: Properly implement default constructor for ResourceObjectPrototype. CID 1457943

Changed paths:
    engines/saga2/objproto.h


diff --git a/engines/saga2/objproto.h b/engines/saga2/objproto.h
index 09aab7941e..2a4d1de790 100644
--- a/engines/saga2/objproto.h
+++ b/engines/saga2/objproto.h
@@ -259,8 +259,34 @@ struct ResourceObjectPrototype {
 
 	uint8           reserved[7];
 
-	//  Default constructor -- do nothing
-	ResourceObjectPrototype(void) {}
+	ResourceObjectPrototype() {
+		classType = 0;
+		script = 0;
+		nameIndex = 0;
+		iconSprite = 0;
+		groundSprite = 0;
+
+		for (int i = 0; i < 4; ++i)
+			colorMap[i] = 0;
+
+		mass = bulk = crossSection = height = toughness = breakType = 0;
+		maxCapacity = 0;
+		lockType = 0;
+		acceptableItems = 0;
+		weaponDamage = weaponFireRate = maximumRange = missileType = 0;
+		whereWearable = 0;
+		damageAbsorbtion = damageDivider = defenseBonus = 0;
+		maxCharges = chargeType = 0;
+		flags = 0;
+		price = 0;
+		heldSpriteBase = 0;
+		resistance = 0;
+		immunity = 0;
+		soundFXClass = 0;
+
+		for (int i = 0; i < 7; ++i)
+			reserved[i] = 0;
+	}
 
 	//  Copy constructor
 	ResourceObjectPrototype(ResourceObjectPrototype &proto) {