[Scummvm-git-logs] scummvm master -> 669a5c7ab7ed8198439d1fae5edf229bf2ff92a0

[sev-]

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:
449f2eb62a SCUMM: Added missing override keywords
669a5c7ab7 NEWS: Mention SailfishOS port


Commit: 449f2eb62a4810a897f40cf5cbc30871fac50215
    https://github.com/scummvm/scummvm/commit/449f2eb62a4810a897f40cf5cbc30871fac50215
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-08T16:25:30+02:00

Commit Message:
SCUMM: Added missing override keywords

Changed paths:
    engines/scumm/macgui/macgui_indy3.h
    engines/scumm/macgui/macgui_loom.h


diff --git a/engines/scumm/macgui/macgui_indy3.h b/engines/scumm/macgui/macgui_indy3.h
index e7b5cfc6d73..de6d0e8093f 100644
--- a/engines/scumm/macgui/macgui_indy3.h
+++ b/engines/scumm/macgui/macgui_indy3.h
@@ -42,18 +42,18 @@ public:
 	MacIndy3Gui(ScummEngine *vm, const Common::Path &resourceFile);
 	~MacIndy3Gui();
 
-	const Common::String name() const { return "Indy"; }
+	const Common::String name() const override { return "Indy"; }
 
 	Graphics::Surface _textArea;
 
-	const Graphics::Font *getFontByScummId(int32 id);
+	const Graphics::Font *getFontByScummId(int32 id) override;
 
-	void setupCursor(int &width, int &height, int &hotspotX, int &hotspotY, int &animate);
+	void setupCursor(int &width, int &height, int &hotspotX, int &hotspotY, int &animate) override;
 
-	Graphics::Surface *textArea() { return &_textArea; }
-	void clearTextArea() { _textArea.fillRect(Common::Rect(_textArea.w, _textArea.h), kBlack); }
-	void initTextAreaForActor(Actor *a, byte color);
-	void printCharToTextArea(int chr, int x, int y, int color);
+	Graphics::Surface *textArea() override { return &_textArea; }
+	void clearTextArea() override { _textArea.fillRect(Common::Rect(_textArea.w, _textArea.h), kBlack); }
+	void initTextAreaForActor(Actor *a, byte color) override;
+	void printCharToTextArea(int chr, int x, int y, int color) override;
 
 	// There is a distinction between the GUI being allowed and being
 	// active. Allowed means that it's allowed to draw verbs, but not that
@@ -65,22 +65,22 @@ public:
 	// it's not drawing verbs, so the SCUMM engine is allowed to draw in
 	// the verb area to clear the power meters and text.
 
-	bool isVerbGuiActive() const;
+	bool isVerbGuiActive() const override;
 
-	void reset();
-	void resetAfterLoad();
-	void update(int delta);
-	bool handleEvent(Common::Event event);
+	void reset() override;
+	void resetAfterLoad() override;
+	void update(int delta) override;
+	bool handleEvent(Common::Event event) override;
 
 protected:
-	bool getFontParams(FontId fontId, int &id, int &size, int &slant) const;
+	bool getFontParams(FontId fontId, int &id, int &size, int &slant) const override;
 
-	bool handleMenu(int id, Common::String &name);
+	bool handleMenu(int id, Common::String &name) override;
 
-	void runAboutDialog();
-	bool runOpenDialog(int &saveSlotToHandle);
-	bool runSaveDialog(int &saveSlotToHandle, Common::String &name);
-	bool runOptionsDialog();
+	void runAboutDialog() override;
+	bool runOpenDialog(int &saveSlotToHandle) override;
+	bool runSaveDialog(int &saveSlotToHandle, Common::String &name) override;
+	bool runOptionsDialog() override;
 	bool runIqPointsDialog();
 
 	void readStrings() override;
diff --git a/engines/scumm/macgui/macgui_loom.h b/engines/scumm/macgui/macgui_loom.h
index 9dbdb43c546..149c938079b 100644
--- a/engines/scumm/macgui/macgui_loom.h
+++ b/engines/scumm/macgui/macgui_loom.h
@@ -35,28 +35,28 @@ public:
 	MacLoomGui(ScummEngine *vm, const Common::Path &resourceFile);
 	~MacLoomGui();
 
-	const Common::String name() const { return "Loom"; }
+	const Common::String name() const override { return "Loom"; }
 
-	bool handleEvent(Common::Event event);
+	bool handleEvent(Common::Event event) override;
 
-	const Graphics::Font *getFontByScummId(int32 id);
+	const Graphics::Font *getFontByScummId(int32 id) override;
 
-	void setupCursor(int &width, int &height, int &hotspotX, int &hotspotY, int &animate);
+	void setupCursor(int &width, int &height, int &hotspotX, int &hotspotY, int &animate) override;
 
-	void resetAfterLoad();
-	void update(int delta);
+	void resetAfterLoad() override;
+	void update(int delta) override;
 
 	void runDraftsInventory();
 
 protected:
-	bool getFontParams(FontId fontId, int &id, int &size, int &slant) const;
+	bool getFontParams(FontId fontId, int &id, int &size, int &slant) const override;
 
-	bool handleMenu(int id, Common::String &name);
+	bool handleMenu(int id, Common::String &name) override;
 
-	void runAboutDialog();
-	bool runOpenDialog(int &saveSlotToHandle);
-	bool runSaveDialog(int &saveSlotToHandle, Common::String &name);
-	bool runOptionsDialog();
+	void runAboutDialog() override;
+	bool runOpenDialog(int &saveSlotToHandle) override;
+	bool runSaveDialog(int &saveSlotToHandle, Common::String &name) override;
+	bool runOptionsDialog() override;
 
 	void readStrings() override;
 


Commit: 669a5c7ab7ed8198439d1fae5edf229bf2ff92a0
    https://github.com/scummvm/scummvm/commit/669a5c7ab7ed8198439d1fae5edf229bf2ff92a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-08T16:28:31+02:00

Commit Message:
NEWS: Mention SailfishOS port

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index c8d6fa954ff..b028665bf6c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,9 @@ For a more comprehensive changelog of the latest experimental code, see:
   - Added support for The Space Bar.
   - Added support for Moonbase Commander.
 
+ New platforms:
+  - Added SailfishOS port.
+
  General:
   - Fixed GLSL version parsing on some OpenGL ES2 platforms.
   - Added optional dependency for libopenmpt for sound.