[Scummvm-git-logs] scummvm master -> 35e7d3727a8302fb352fc881d9c500849ddfe92f

[sev-]

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

Summary:
62f067a72c MACGUI: Fix incorrect logical operator usage. PVS-Studio V564
e732572b87 WINTERMUTE: Remove duplicate debugger command. PVS-Studio V760
0672730ee9 ULTIMA: NUVIE: Fix debug message. PVS-Studio V510
35e7d3727a SAGA2: Avoid double destructor. PVS-Studio V749


Commit: 62f067a72cb2e0bc4bbb3ee09ef83e428dab98b1
    https://github.com/scummvm/scummvm/commit/62f067a72cb2e0bc4bbb3ee09ef83e428dab98b1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-27T23:27:44+02:00

Commit Message:
MACGUI: Fix incorrect logical operator usage. PVS-Studio V564

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 69a4a90468f..70ec88b48e5 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -1089,7 +1089,7 @@ bool MacMenu::draw(ManagedSurface *g, bool forceRedraw) {
 		}
 	}
 
-	if ((_wm->_mode & kWMModalMenuMode) | !_wm->_screen)
+	if ((_wm->_mode & kWMModalMenuMode) || !_wm->_screen)
 		g_system->copyRectToScreen(_screen.getBasePtr(_bbox.left, _bbox.top), _screen.pitch, _bbox.left, _bbox.top, _bbox.width(), _bbox.height());
 
 


Commit: e732572b8776eca2eb36c131041fb5e4b002e09a
    https://github.com/scummvm/scummvm/commit/e732572b8776eca2eb36c131041fb5e4b002e09a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-27T23:28:01+02:00

Commit Message:
WINTERMUTE: Remove duplicate debugger command. PVS-Studio V760

Changed paths:
    engines/wintermute/debugger.cpp


diff --git a/engines/wintermute/debugger.cpp b/engines/wintermute/debugger.cpp
index a38c3682050..2f1ba8dd8e5 100644
--- a/engines/wintermute/debugger.cpp
+++ b/engines/wintermute/debugger.cpp
@@ -33,7 +33,6 @@ namespace Wintermute {
 Console::Console(WintermuteEngine *vm) : GUI::Debugger(), _engineRef(vm) {
 	registerCmd("show_fps", WRAP_METHOD(Console, Cmd_ShowFps));
 	registerCmd("dump_file", WRAP_METHOD(Console, Cmd_DumpFile));
-	registerCmd("show_fps", WRAP_METHOD(Console, Cmd_ShowFps));
 	registerCmd("dump_file", WRAP_METHOD(Console, Cmd_DumpFile));
 	registerCmd("help", WRAP_METHOD(Console, Cmd_Help));
 	// Actual (script) debugger commands


Commit: 0672730ee93f60198baa00a6249a14cc12292b30
    https://github.com/scummvm/scummvm/commit/0672730ee93f60198baa00a6249a14cc12292b30
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-27T23:28:01+02:00

Commit Message:
ULTIMA: NUVIE: Fix debug message. PVS-Studio V510

Changed paths:
    engines/ultima/nuvie/core/converse_interpret.cpp


diff --git a/engines/ultima/nuvie/core/converse_interpret.cpp b/engines/ultima/nuvie/core/converse_interpret.cpp
index f6cf678eeb7..59aaf9a243e 100644
--- a/engines/ultima/nuvie/core/converse_interpret.cpp
+++ b/engines/ultima/nuvie/core/converse_interpret.cpp
@@ -1111,7 +1111,7 @@ bool ConverseInterpret::evop(Common::Stack<converse_typed_value> &i) {
 		}
 		break;
 	default:
-		DEBUG(0, LEVEL_ERROR, "Converse: UNK EVOP=%02x\n", inVal);
+		DEBUG(0, LEVEL_ERROR, "Converse: UNK EVOP=%02x\n", inVal.val);
 		success = false;
 	}
 	i.push(out);


Commit: 35e7d3727a8302fb352fc881d9c500849ddfe92f
    https://github.com/scummvm/scummvm/commit/35e7d3727a8302fb352fc881d9c500849ddfe92f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-27T23:28:01+02:00

Commit Message:
SAGA2: Avoid double destructor. PVS-Studio V749

Changed paths:
    engines/saga2/videobox.cpp


diff --git a/engines/saga2/videobox.cpp b/engines/saga2/videobox.cpp
index e7097226943..fd4857c1326 100644
--- a/engines/saga2/videobox.cpp
+++ b/engines/saga2/videobox.cpp
@@ -180,9 +180,6 @@ int16 openVidBox(char *fileName) {
 	// open this video box
 	int16 result = videoBox.openVidBox(fileName);
 
-	// get rid of the box when done
-	videoBox.~CVideoBox();
-
 	g_vm->_pal->quickRestorePalette();
 	// replace the damaged area
 	mainWindow->invalidate(&area);