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

[Strangerke]

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

Summary:
dfa9ab7110 M4: Riddle: Fix PVS V703 in interface, remove dead code and enforce constness on a couple of variables


Commit: dfa9ab71105d35d1fc8df4f6816c1b78a146239e
    https://github.com/scummvm/scummvm/commit/dfa9ab71105d35d1fc8df4f6816c1b78a146239e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-06-17T22:10:46+01:00

Commit Message:
M4: Riddle: Fix PVS V703 in interface, remove dead code and enforce constness on a couple of variables

Changed paths:
    engines/m4/riddle/gui/interface.cpp
    engines/m4/riddle/gui/interface.h


diff --git a/engines/m4/riddle/gui/interface.cpp b/engines/m4/riddle/gui/interface.cpp
index b7587a360d1..4c4f5b916ab 100644
--- a/engines/m4/riddle/gui/interface.cpp
+++ b/engines/m4/riddle/gui/interface.cpp
@@ -353,8 +353,8 @@ void Interface::dispatch_command() {
 }
 
 void Interface::handleState(ControlStatus status) {
-	int highlight = _inventory->_highlight;
-	int index = _inventory->_scroll + highlight;
+	const int highlight = _inventory->_highlight;
+	const int index = _inventory->_scroll + highlight;
 
 	switch (status) {
 	case NOTHING:
diff --git a/engines/m4/riddle/gui/interface.h b/engines/m4/riddle/gui/interface.h
index 613e3b1f14c..520aa1fb5a3 100644
--- a/engines/m4/riddle/gui/interface.h
+++ b/engines/m4/riddle/gui/interface.h
@@ -37,8 +37,6 @@ using M4::GUI::ControlStatus;
 
 struct Interface : public M4::Interface {
 	class BackpackClass : public ButtonClass {
-	private:
-		//int _field32 = 0;
 
 	public:
 		BackpackClass(const RectClass &r, const Common::String &btnName, int16 tag,
@@ -66,7 +64,6 @@ public:
 	GUI::ButtonClass *_btnBinky = nullptr;
 
 	int _sprite = 22; // main_interface_sprite;
-	bool _shown = false;
 	const HotSpotRec *_hotspot = nullptr;
 	int _savedX = 0, _savedY = 0;
 	char _prepText[40] = { 0 };