[Scummvm-git-logs] scummvm master -> 9822b946dc7a52850c041ce2d7333a6a12b8bbd6

[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:
79f58a2ed0 TETRAEDGE: Fix some unneccessary copies noticed by Coverity
9822b946dc ULTIMA8: Fix some small coverity-identified issues


Commit: 79f58a2ed023da3e67436d685456259e254e1d05
    https://github.com/scummvm/scummvm/commit/79f58a2ed023da3e67436d685456259e254e1d05
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-05-16T08:11:51+09:00

Commit Message:
TETRAEDGE: Fix some unneccessary copies noticed by Coverity

Changed paths:
    engines/tetraedge/game/lua_binds.cpp


diff --git a/engines/tetraedge/game/lua_binds.cpp b/engines/tetraedge/game/lua_binds.cpp
index 31664f8286d..5cfcce60c00 100644
--- a/engines/tetraedge/game/lua_binds.cpp
+++ b/engines/tetraedge/game/lua_binds.cpp
@@ -715,7 +715,7 @@ static int tolua_ExportedFunctions_SetVisibleCellphone00(lua_State *L) {
 
 static void ShowObject(const Common::String &objName);
 
-static void StartAnimation(const Common::String name, int loops, bool repeat) {
+static void StartAnimation(const Common::String &name, int loops, bool repeat) {
 	ShowObject(name);
 	Game *game = g_engine->getGame();
 	if (game->startAnimation(name, loops, repeat))
@@ -1202,8 +1202,7 @@ static void RotateGroundObject(const Common::String &name, float x, float y, flo
 	Object3D *obj = game->scene().object3D(name);
 	if (!obj)
 		error("[RotateGroundObject] Object not found %s", name.c_str());
-	TeQuaternion rot = obj->model()->rotation();
-	obj->_rotateStart = rot;
+	obj->_rotateStart = obj->model()->rotation();
 	obj->_rotateAmount = TeVector3f32(x, y, z);
 	obj->_rotateTimer.start();
 	obj->_rotateTime = time;


Commit: 9822b946dc7a52850c041ce2d7333a6a12b8bbd6
    https://github.com/scummvm/scummvm/commit/9822b946dc7a52850c041ce2d7333a6a12b8bbd6
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-05-16T08:25:03+09:00

Commit Message:
ULTIMA8: Fix some small coverity-identified issues

Changed paths:
    engines/ultima/ultima8/gumps/credits_gump.cpp
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/gumps/credits_gump.cpp b/engines/ultima/ultima8/gumps/credits_gump.cpp
index 3ba34c23e9f..2fef5de3a05 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.cpp
+++ b/engines/ultima/ultima8/gumps/credits_gump.cpp
@@ -170,6 +170,9 @@ void CreditsGump::run() {
 	}
 
 	if (_state == CS_PLAYING && available <= 160) {
+		// This shouldn't happen, but just in case..
+		if (nextblock == -1)
+			nextblock = 0;
 		// time to render next block
 		Rect bounds;
 		_scroll[nextblock]->GetSurfaceDims(bounds);
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 38c3f0884b5..0255bdbc997 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -137,7 +137,7 @@ Ultima8Engine::Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription
 		_showTouching(false), _timeOffset(0), _hasCheated(false), _cheatsEnabled(false),
 		_fontOverride(false), _fontAntialiasing(false), _audioMixer(0), _inverterGump(nullptr),
 	    _lerpFactor(256), _inBetweenFrame(false), _crusaderTeleporting(false), _moveKeyFrame(0),
-		_highRes(false) {
+		_highRes(false), _priorFrameCounterTime(0) {
 	_instance = this;
 }
 
@@ -150,7 +150,6 @@ Ultima8Engine::~Ultima8Engine() {
 	delete _mouse;
 	delete _gameData;
 	delete _world;
-	delete _ucMachine;
 	delete _fontManager;
 	delete _screen;
 	delete _fileSystem;