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

[mduggan]

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:
da3de4f075 ULTIMA8: Check return value to make coverity happy
aa77668263 ULTIMA8: Fix debug message for calli


Commit: da3de4f0752c6e1932ee3263ab198c48b73aede4
    https://github.com/scummvm/scummvm/commit/da3de4f0752c6e1932ee3263ab198c48b73aede4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-07T10:24:50+09:00

Commit Message:
ULTIMA8: Check return value to make coverity happy

Changed paths:
    engines/ultima/ultima8/graphics/avi_player.cpp


diff --git a/engines/ultima/ultima8/graphics/avi_player.cpp b/engines/ultima/ultima8/graphics/avi_player.cpp
index f4d80498c4..4c0c306fe5 100644
--- a/engines/ultima/ultima8/graphics/avi_player.cpp
+++ b/engines/ultima/ultima8/graphics/avi_player.cpp
@@ -88,9 +88,10 @@ void AVIPlayer::paint(RenderSurface *surf, int /*lerp*/) {
 	// movies too (eg, T02 for the intro).  For now just point-scale.
 	if (_doubleSize) {
 		const Scaler *pointScaler = &Ultima8Engine::get_instance()->point_scaler;
-		surf->ScalerBlit(&_currentFrame, 0, 0, _currentFrame.w, _currentFrame.h,
-						_xoff, _yoff, _currentFrame.w * 2, _currentFrame.h * 2,
-						pointScaler, false);
+		bool ok = surf->ScalerBlit(&_currentFrame, 0, 0, _currentFrame.w, _currentFrame.h,
+								   _xoff, _yoff, _currentFrame.w * 2, _currentFrame.h * 2,
+								   pointScaler, false);
+		assert(ok);
 	} else {
 		surf->Blit(&_currentFrame, 0, 0, _currentFrame.w, _currentFrame.h,
 				   _xoff, _yoff);


Commit: aa77668263b02f7c32c29991b21e5be0cacf1e19
    https://github.com/scummvm/scummvm/commit/aa77668263b02f7c32c29991b21e5be0cacf1e19
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-07-07T10:24:51+09:00

Commit Message:
ULTIMA8: Fix debug message for calli

Changed paths:
    engines/ultima/ultima8/usecode/uc_machine.cpp


diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index 44f205384e..9e3d5bfc2e 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -360,7 +360,7 @@ void UCMachine::execProcess(UCProcess *p) {
 			//! TODO
 			uint16 arg_bytes = cs.readByte();
 			uint16 func = cs.readUint16LE();
-			LOGPF(("calli\t\t%04Xh (%02Xh arg bytes) %s ", func, arg_bytes, _convUse->intrinsics()[func]));
+			LOGPF(("calli\t\t%04Xh (%02Xh arg bytes) %s\n", func, arg_bytes, _convUse->intrinsics()[func]));
 
 			// !constants
 			if (func >= _intrinsicCount || _intrinsics[func] == 0) {