[Scummvm-git-logs] scummvm master -> 18953d59072875ea6401ece068a3d37a1e99d007

[sev-]

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

Summary:
1aaf997aac ENGINES: Fix CID 1519034 warning
c7eb6a35c7 NANCY: Init class variable. CID 1505753
cdfe274272 GRAPHICS: MACGUI: Fix warnings. CID 1519083
1ff6a5538b GUI: Fix out of bounds access. CID 1519091
18953d5907 GUI: Remove unused variable. CID 1519082, 1519090, 1519092


Commit: 1aaf997aac5c4ad7e0598bd44ab3abbaf751483c
    https://github.com/scummvm/scummvm/commit/1aaf997aac5c4ad7e0598bd44ab3abbaf751483c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:36:33+02:00

Commit Message:
ENGINES: Fix CID 1519034 warning

Changed paths:
    engines/engine.cpp


diff --git a/engines/engine.cpp b/engines/engine.cpp
index 47e7a1542da..e7da04a8b3f 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -462,7 +462,7 @@ void initGraphics3d(int width, int height) {
 
 	if (!splash && !GUI::GuiManager::instance()._launched) {
 		Common::Event event;
-		g_system->getEventManager()->pollEvent(event);
+		(void)g_system->getEventManager()->pollEvent(event);
 		splashScreen();
 	}
 }
@@ -646,7 +646,7 @@ void Engine::saveAutosaveIfEnabled() {
 	}
 
 	_lastAutosaveTime = _system->getMillis();
-	
+
 	if (!saveFlag) {
 		// Set the next autosave interval to be in 5 minutes, rather than whatever
 		// full autosave interval the user has selected


Commit: c7eb6a35c708fb81a5f96f12ca13a7a9bd21edf0
    https://github.com/scummvm/scummvm/commit/c7eb6a35c708fb81a5f96f12ca13a7a9bd21edf0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:39:41+02:00

Commit Message:
NANCY: Init class variable. CID 1505753

Changed paths:
    engines/nancy/action/puzzle/passwordpuzzle.h


diff --git a/engines/nancy/action/puzzle/passwordpuzzle.h b/engines/nancy/action/puzzle/passwordpuzzle.h
index 6e23f95b456..17780039ee1 100644
--- a/engines/nancy/action/puzzle/passwordpuzzle.h
+++ b/engines/nancy/action/puzzle/passwordpuzzle.h
@@ -40,7 +40,7 @@ public:
 	void handleInput(NancyInput &input) override;
 
 	uint16 _fontID = 0;
-	uint16 _cursorBlinkTime;
+	uint16 _cursorBlinkTime = 500;
 	Common::Rect _nameBounds;
 	Common::Rect _passwordBounds;
 	// _screenPosition 0x24


Commit: cdfe2742721cf7fdecf3f847abf53f9926009a8f
    https://github.com/scummvm/scummvm/commit/cdfe2742721cf7fdecf3f847abf53f9926009a8f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:45:29+02:00

Commit Message:
GRAPHICS: MACGUI: Fix warnings. CID 1519083

Changed paths:
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 5df15274d7a..4c6c15a85aa 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -458,9 +458,9 @@ private:
 	void *_engineR;
 	void (*_redrawEngineCallback)(void *engine);
 
-	MacCursorType _tempType;
+	MacCursorType _tempType = kMacCursorArrow;
 	Common::Stack<MacCursorType> _cursorTypeStack;
-	Cursor *_cursor;
+	Cursor *_cursor = nullptr;
 
 	MacWidget *_activeWidget;
 	MacWidget *_lockedWidget;


Commit: 1ff6a5538baabc14c19864e03a367bea6f9fb7c5
    https://github.com/scummvm/scummvm/commit/1ff6a5538baabc14c19864e03a367bea6f9fb7c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:46:56+02:00

Commit Message:
GUI: Fix out of bounds access. CID 1519091

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 8b1b019fb37..1e42e0cd9cc 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1694,7 +1694,7 @@ TextColor ThemeEngine::getTextColor(DrawData ddId) const {
 
 TextColorData *ThemeEngine::getTextColorData(TextColor color) const {
 	if (color >= kTextColorMAX)
-		color = kTextColorMAX;
+		color = kTextColorNormal;
 
 	return _textColors[color];
 }


Commit: 18953d59072875ea6401ece068a3d37a1e99d007
    https://github.com/scummvm/scummvm/commit/18953d59072875ea6401ece068a3d37a1e99d007
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-09-19T15:49:07+02:00

Commit Message:
GUI: Remove unused variable. CID 1519082, 1519090, 1519092

Changed paths:
    gui/widgets/richtext.h


diff --git a/gui/widgets/richtext.h b/gui/widgets/richtext.h
index 52a31cbaa72..aae711cbf5e 100644
--- a/gui/widgets/richtext.h
+++ b/gui/widgets/richtext.h
@@ -45,7 +45,6 @@ protected:
 	int16 _scrolledX, _scrolledY;
 	int _scrollbarWidth;
 	uint16 _limitH;
-	uint32 _reflowCmd;
 	int _textWidth;
 
 	Common::String _imageArchive;