[Scummvm-git-logs] scummvm master -> 85c9da6594189311260a13bc35ff934209ad5883

[sev-]

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

Summary:
df54bc8fd6 SAGA2: Init hResource on failed read. CID 1458092
e9a3b99931 SAGA2: Properly initialize MetaTileID and ActiveItemID. CID 1457892, 1458029
32a13e7324 SAGA2: Fix CImageNode initialization. CID 1457944
d368064a18 SAGA2: Properly initialize alarm class. CID 1457913
85c9da6594 SAGA2: Class initialization fixes. CID 1457913, 1457897


Commit: df54bc8fd6f84929e8b3387d2afb375d77c9e17c
    https://github.com/scummvm/scummvm/commit/df54bc8fd6f84929e8b3387d2afb375d77c9e17c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T13:09:57+02:00

Commit Message:
SAGA2: Init hResource on failed read. CID 1458092

Changed paths:
    engines/saga2/hresmgr.cpp


diff --git a/engines/saga2/hresmgr.cpp b/engines/saga2/hresmgr.cpp
index 68d08b6579..2d6ecf2427 100644
--- a/engines/saga2/hresmgr.cpp
+++ b/engines/saga2/hresmgr.cpp
@@ -337,6 +337,8 @@ hResource::hResource(const char *resname, const char desc[]) {
 	_valid = false;
 	_base = nullptr;
 	_parent = nullptr;
+	_table = nullptr;
+	_firstGroupOffset = 0;
 	_numEntries = 0;
 	_filename = resname;
 
@@ -362,7 +364,6 @@ hResource::hResource(const char *resname, const char desc[]) {
 	if (_base == nullptr || _table == nullptr)
 		return;
 
-
 	debugC(1, kDebugResources, "Reading %d entries:", _numEntries);
 	for (int i = 0; i < _numEntries; ++i)
 		readEntry(_base[i]);


Commit: e9a3b9993194a2e7e4bc96c599aa304385a9ee9b
    https://github.com/scummvm/scummvm/commit/e9a3b9993194a2e7e4bc96c599aa304385a9ee9b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T13:18:29+02:00

Commit Message:
SAGA2: Properly initialize MetaTileID and ActiveItemID. CID 1457892, 1458029

Changed paths:
    engines/saga2/idtypes.h


diff --git a/engines/saga2/idtypes.h b/engines/saga2/idtypes.h
index b3a2f893b6..433677f6b0 100644
--- a/engines/saga2/idtypes.h
+++ b/engines/saga2/idtypes.h
@@ -76,7 +76,7 @@ struct MetaTileID {
 	int16           index;          //  index into metatile array
 
 	//  Default constructor
-	MetaTileID(void) {}
+	MetaTileID(void) : map(0), index(0) {}
 
 	//  Copy constructor
 	MetaTileID(const MetaTileID &id) : map(id.map), index(id.index) {}
@@ -128,7 +128,7 @@ struct ActiveItemID {
 	//      next 13 bits index
 
 	//  Default constructor
-	ActiveItemID(void) {}
+	ActiveItemID(void) : val(0) {}
 
 	//  Copy constructor
 	ActiveItemID(const ActiveItemID &id) : val(id.val) {


Commit: 32a13e73249e44412d231c2a6bd80e8c7bf6404a
    https://github.com/scummvm/scummvm/commit/32a13e73249e44412d231c2a6bd80e8c7bf6404a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T13:23:34+02:00

Commit Message:
SAGA2: Fix CImageNode initialization. CID 1457944

Changed paths:
    engines/saga2/imagcach.cpp


diff --git a/engines/saga2/imagcach.cpp b/engines/saga2/imagcach.cpp
index 6fe544df88..9b2136a3df 100644
--- a/engines/saga2/imagcach.cpp
+++ b/engines/saga2/imagcach.cpp
@@ -31,31 +31,24 @@
 
 namespace Saga2 {
 
-#if DEBUG
-extern char *idname(long s);
-#endif
-
 CImageNode::CImageNode(hResContext *con, uint32 resID) {
 	if (con) {
-#if DEBUG
-		char            descr[32];
-
-		sprintf(descr, "CImage '%s'", idname(resID));
-
-		image           = LoadResource(con, resID, descr);
-#else
 		image           = LoadResource(con, resID, "CImageNode Allocation");
-#endif
 		resourceID      = resID;
 		contextID       = con->getResID();
 		requested       = 0;    // zero request for this node at creation
+	} else {
+		image = nullptr;
+		resourceID = 0;
+		contextID = 0;
+		requested = 0;
 	}
 }
 
 CImageNode::~CImageNode(void) {
 	if (image) {
 		free(image);
-		image = NULL;
+		image = nullptr;
 	}
 }
 


Commit: d368064a189edf12a9559d6599b8a1dd938e2830
    https://github.com/scummvm/scummvm/commit/d368064a189edf12a9559d6599b8a1dd938e2830
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T13:30:34+02:00

Commit Message:
SAGA2: Properly initialize alarm class. CID 1457913

Changed paths:
    engines/saga2/fta.h


diff --git a/engines/saga2/fta.h b/engines/saga2/fta.h
index 80f85805fa..9022a12c82 100644
--- a/engines/saga2/fta.h
+++ b/engines/saga2/fta.h
@@ -145,6 +145,7 @@ private:
 	uint32 basetime;                            // timer alarm was set
 	uint32 duration;                            // duration of alarm
 public:
+	Alarm() : basetime(0), duration(0) {}
 	void set(uint32 duration);
 	bool check(void);
 	uint32 elapsed(void);                    // time elapsed since alarm set


Commit: 85c9da6594189311260a13bc35ff934209ad5883
    https://github.com/scummvm/scummvm/commit/85c9da6594189311260a13bc35ff934209ad5883
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-10T13:30:58+02:00

Commit Message:
SAGA2: Class initialization fixes. CID 1457913, 1457897

Changed paths:
    engines/saga2/intrface.cpp


diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index 1e3a413274..b73d606a9d 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -448,6 +448,7 @@ CPlaqText::CPlaqText(gPanelList     &list,
 	buttonFont      = font;
 	textRect        = box;
 	textPosition    = textPos;
+	oldFont         = nullptr;
 }
 
 void CPlaqText::enable(bool abled) {
@@ -699,16 +700,16 @@ CStatusLine::CStatusLine(gPanelList         &list,
                          int32           /*frameTime*/,
                          int16           ident,
                          AppFunc         *cmd) :
-	CPlaqText(list, box, msg, font, textPos, pal, ident, cmd)
-
-{
-	int         i;
+	CPlaqText(list, box, msg, font, textPos, pal, ident, cmd) {
 
 	lineDisplayed = false;
 	queueHead = queueTail = 0;
 
-	for (i = 0; i < ARRAYSIZE(lineQueue); i++)
+	for (int i = 0; i < ARRAYSIZE(lineQueue); i++) {
 		lineQueue[i].text = nullptr;
+		lineQueue[i].frameTime = 0;
+	}
+
 }
 
 CStatusLine::~CStatusLine(void) {