[Scummvm-git-logs] scummvm master -> 529af3837c7ac16e0c1ceb29d4907e27e9c20f24

[dreammaster]

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

Summary:
5ae1a92049 ULTIMA8: Fix some gcc warnings
529af3837c ULTIMA8: Change pathfinder failure messages from warning to info


Commit: 5ae1a92049e92faa42ef1578df250990a8778575
    https://github.com/scummvm/scummvm/commit/5ae1a92049e92faa42ef1578df250990a8778575
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-03-08T20:02:27-07:00

Commit Message:
ULTIMA8: Fix some gcc warnings

Changed paths:
    engines/ultima/ultima8/convert/convert_shape.cpp
    engines/ultima/ultima8/kernel/segmented_pool.cpp


diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index 535230524f..9257764739 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -403,6 +403,7 @@ int ConvertShape::CalcNumFrames(IDataSource *source, const ConvertShapeFormat *c
 		uint32 frame_length = real_len-frame_offset;
 		if (csf->_bytes_frame_length)
 			frame_length = source->readX(csf->_bytes_frame_length) + csf->_bytes_frame_length_kludge;
+		debug(MM_INFO, "Frame %d length = %xh", f, frame_length);
 	}
 
 	source->seek(save_pos);
diff --git a/engines/ultima/ultima8/kernel/segmented_pool.cpp b/engines/ultima/ultima8/kernel/segmented_pool.cpp
index 3806bbeccf..24a2026d6a 100644
--- a/engines/ultima/ultima8/kernel/segmented_pool.cpp
+++ b/engines/ultima/ultima8/kernel/segmented_pool.cpp
@@ -155,15 +155,15 @@ void SegmentedPool::deallocate(void *ptr) {
 
 void SegmentedPool::printInfo() const {
 	uint16 i;
-	size_t max, min, total;
+	uint32 max, min, total;
 	SegmentedPoolNode *node;
 
 	debug(MM_INFO, "start address 0x%p\tend address 0x%p\tnodeOffset 0x%x",
-		_startOfPool, _endOfPool, _nodeOffset);
+		_startOfPool, _endOfPool, (uint32)_nodeOffset);
 	debug(MM_INFO, "_nodeCapacity %u b\n   total _nodes %u\tfree _nodes %u",
-		_nodeCapacity, _nodes, _freeNodeCount);
-	debug(MM_INFO, "total memory: %d\tfree memory: %d",
-		_nodeCapacity * _nodes, _nodeCapacity * _freeNodeCount);
+		(uint32)_nodeCapacity, _nodes, _freeNodeCount);
+	debug(MM_INFO, "total memory: %u\tfree memory: %u",
+		(uint32)(_nodeCapacity * _nodes), (uint32)(_nodeCapacity * _freeNodeCount));
 
 	max = 0;
 	min = _nodeCapacity;


Commit: 529af3837c7ac16e0c1ceb29d4907e27e9c20f24
    https://github.com/scummvm/scummvm/commit/529af3837c7ac16e0c1ceb29d4907e27e9c20f24
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-03-08T20:04:10-07:00

Commit Message:
ULTIMA8: Change pathfinder failure messages from warning to info

Changed paths:
    engines/ultima/ultima8/world/actors/pathfinder_process.cpp


diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
index fbfe58cf09..c08756081a 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.cpp
@@ -72,9 +72,8 @@ PathfinderProcess::PathfinderProcess(Actor *actor_, ObjId item_, bool hit) {
 	bool ok = pf.pathfind(_path);
 
 	if (!ok) {
-		perr << "PathfinderProcess: actor " << _itemNum
-		     << " failed to find _path" << Std::endl;
 		// can't get there...
+		debug(MM_INFO, "PathfinderProcess: actor %d failed to find path", _itemNum);
 		_result = PATH_FAILED;
 		terminateDeferred();
 		return;
@@ -103,9 +102,8 @@ PathfinderProcess::PathfinderProcess(Actor *actor_,
 	bool ok = pf.pathfind(_path);
 
 	if (!ok) {
-		perr << "PathfinderProcess: actor " << _itemNum
-		     << " failed to find _path" << Std::endl;
 		// can't get there...
+		debug(MM_INFO, "PathfinderProcess: actor %d failed to find path", _itemNum);
 		_result = PATH_FAILED;
 		terminateDeferred();
 		return;
@@ -216,9 +214,8 @@ void PathfinderProcess::run() {
 
 		_currentStep = 0;
 		if (!ok) {
-			perr << "PathfinderProcess: actor " << _itemNum
-			     << " failed to find _path" << Std::endl;
 			// can't get there anymore
+			debug(MM_INFO, "PathfinderProcess: actor %d failed to find path", _itemNum);
 			_result = PATH_FAILED;
 			terminate();
 			return;