[Scummvm-git-logs] scummvm master -> 0942c69e7342f9d6a5e33ad8c4c0acb465ffd80f

[sev-]

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

Summary:
bcaba43ff0 SAGA2: Fix more uninitialized variables
ab9e72e0cb SAGA2: Init QueueItem. CID 1458217
cafd2a67e9 SAGA2: Properly iniy HuntTask on loading. CID 1458215
357ac01612 SAGA2: Clear saveAutoMap buffer before generating. CID 1458212
374fd0f680 SAGA2: Fix default constructor for delayedNavigation struct. CID 1457847
0942c69e73 SAGA2: Set timer to active on loading. CID 1458214


Commit: bcaba43ff00bdca38e7c2633445bcaf0caeb9d12
    https://github.com/scummvm/scummvm/commit/bcaba43ff00bdca38e7c2633445bcaf0caeb9d12
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Fix more uninitialized variables

Changed paths:
    engines/saga2/button.cpp
    engines/saga2/gamerate.h
    engines/saga2/hresmgr.cpp


diff --git a/engines/saga2/button.cpp b/engines/saga2/button.cpp
index 15bc73352c..2536cabb23 100644
--- a/engines/saga2/button.cpp
+++ b/engines/saga2/button.cpp
@@ -709,6 +709,7 @@ gMultCompButton::gMultCompButton(gPanelList &list, const Rect16 &box, void **new
 		max     = 0;
 		min     = 0;
 		current = 0;
+		response = false;
 		return;
 	}
 
diff --git a/engines/saga2/gamerate.h b/engines/saga2/gamerate.h
index 593537ff47..1e1d8b38b9 100644
--- a/engines/saga2/gamerate.h
+++ b/engines/saga2/gamerate.h
@@ -236,6 +236,8 @@ frameSmoother::frameSmoother(int32 fps, uint32 perSec, uint32 now)
 
 	dif5Sec = 0;
 	avg5Sec = 0;
+	secDif = 0;
+	secAvg = 0;
 }
 
 } // end of namespace Saga2
diff --git a/engines/saga2/hresmgr.cpp b/engines/saga2/hresmgr.cpp
index 2d6ecf2427..f1c8e3801c 100644
--- a/engines/saga2/hresmgr.cpp
+++ b/engines/saga2/hresmgr.cpp
@@ -57,6 +57,7 @@ hResContext::hResContext(hResContext *sire, hResID id, const char desc[]) {
 	_bytepos = 0;
 	_handle = &_file;
 	_base = nullptr;
+	_parent = 0;
 
 	if (!_res->_valid)
 		return;


Commit: ab9e72e0cb9fca3be54af516285d874e55436989
    https://github.com/scummvm/scummvm/commit/ab9e72e0cb9fca3be54af516285d874e55436989
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Init QueueItem. CID 1458217

Changed paths:
    engines/saga2/path.cpp


diff --git a/engines/saga2/path.cpp b/engines/saga2/path.cpp
index c8733c3aae..7c0c8f71ce 100644
--- a/engines/saga2/path.cpp
+++ b/engines/saga2/path.cpp
@@ -660,6 +660,7 @@ struct QueueItem {
 		platform = 0;
 		pad = 0;
 		cost = 0;
+		direction = 0;
 	}
 
 	operator int() {


Commit: cafd2a67e914884e7f9cd775c9146c6d248c27a2
    https://github.com/scummvm/scummvm/commit/cafd2a67e914884e7f9cd775c9146c6d248c27a2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Properly iniy HuntTask on loading. CID 1458215

Changed paths:
    engines/saga2/task.cpp


diff --git a/engines/saga2/task.cpp b/engines/saga2/task.cpp
index 486a7785c4..67ffde4f75 100644
--- a/engines/saga2/task.cpp
+++ b/engines/saga2/task.cpp
@@ -1923,6 +1923,8 @@ HuntTask::HuntTask(Common::InSaveFile *in, TaskID id) : Task(in, id) {
 	if (huntFlags & (huntGoto | huntWander)) {
 		TaskID subTaskID = in->readSint16LE();
 		subTask = getTaskAddress(subTaskID);
+	} else {
+		subTask = nullptr;
 	}
 }
 


Commit: 357ac0161298d133098f4c68aced003fde7970f9
    https://github.com/scummvm/scummvm/commit/357ac0161298d133098f4c68aced003fde7970f9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Clear saveAutoMap buffer before generating. CID 1458212

Changed paths:
    engines/saga2/tile.cpp


diff --git a/engines/saga2/tile.cpp b/engines/saga2/tile.cpp
index 46a3ee2226..dd6c9f22eb 100644
--- a/engines/saga2/tile.cpp
+++ b/engines/saga2/tile.cpp
@@ -1650,7 +1650,7 @@ void saveAutoMap(Common::OutSaveFile *out) {
 	out->write("AMAP", 4);
 	out->writeUint32LE(archiveBufSize);
 
-	archiveBuffer = (uint8 *)malloc(archiveBufSize);
+	archiveBuffer = (uint8 *)calloc(archiveBufSize, 1);
 	if (archiveBuffer == nullptr)
 		error("Unable to allocate auto map archive buffer");
 


Commit: 374fd0f68050436ba3b19b80c9cc763c7c395a96
    https://github.com/scummvm/scummvm/commit/374fd0f68050436ba3b19b80c9cc763c7c395a96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Fix default constructor for delayedNavigation struct. CID 1457847

Changed paths:
    engines/saga2/tilemode.cpp


diff --git a/engines/saga2/tilemode.cpp b/engines/saga2/tilemode.cpp
index cc7c2a1577..e6fcde75bf 100644
--- a/engines/saga2/tilemode.cpp
+++ b/engines/saga2/tilemode.cpp
@@ -153,7 +153,10 @@ static struct _delayedNavigation {
 	bool        pathFindFlag;
 	Alarm       delay;
 
-	_delayedNavigation(void) : pathFindFlag(false) {}
+	_delayedNavigation(void) : pathFindFlag(false) {
+		delay.basetime = 0;
+		delay.duration = 0;
+	}
 
 } delayedNavigation;
 static bool navigationDelayed = false;


Commit: 0942c69e7342f9d6a5e33ad8c4c0acb465ffd80f
    https://github.com/scummvm/scummvm/commit/0942c69e7342f9d6a5e33ad8c4c0acb465ffd80f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-07-13T01:25:34+02:00

Commit Message:
SAGA2: Set timer to active on loading. CID 1458214

Changed paths:
    engines/saga2/timers.cpp


diff --git a/engines/saga2/timers.cpp b/engines/saga2/timers.cpp
index 8f604391a2..614f4442d3 100644
--- a/engines/saga2/timers.cpp
+++ b/engines/saga2/timers.cpp
@@ -325,6 +325,8 @@ Timer::Timer(Common::InSaveFile *in) {
 	//  Restore the alarm
 	_alarm.read(in);
 
+	_active = true;
+
 	g_vm->_timers.push_back(this);
 }