[Scummvm-git-logs] scummvm master -> dd4b30856e64864967aa0973c9a6672e39f7820d
dreammaster
noreply at scummvm.org
Fri Dec 26 22:25:04 UTC 2025
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:
dd4b30856e MM: MM1: Show on-screen messages with a scroll
Commit: dd4b30856e64864967aa0973c9a6672e39f7820d
https://github.com/scummvm/scummvm/commit/dd4b30856e64864967aa0973c9a6672e39f7820d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-12-27T09:23:42+11:00
Commit Message:
MM: MM1: Show on-screen messages with a scroll
Changed paths:
engines/mm/mm1/views/game_view.h
engines/mm/mm1/views_enh/game_view.cpp
engines/mm/mm1/views_enh/game_view.h
diff --git a/engines/mm/mm1/views/game_view.h b/engines/mm/mm1/views/game_view.h
index 9184c85dd2f..df343a0ceb9 100644
--- a/engines/mm/mm1/views/game_view.h
+++ b/engines/mm/mm1/views/game_view.h
@@ -45,16 +45,18 @@ private:
*/
void drawScene();
- /**
- * Draws the dialog message
- */
- void drawDialogMessage();
-
/**
* Draws a business name or other information like
* container container for searches
*/
void drawDescriptionLine();
+
+protected:
+ /**
+ * Draws the dialog message
+ */
+ virtual void drawDialogMessage();
+
public:
GameView(UIElement *owner);
virtual ~GameView() {}
diff --git a/engines/mm/mm1/views_enh/game_view.cpp b/engines/mm/mm1/views_enh/game_view.cpp
index f5e909f1c5d..a42b6e25a65 100644
--- a/engines/mm/mm1/views_enh/game_view.cpp
+++ b/engines/mm/mm1/views_enh/game_view.cpp
@@ -20,6 +20,7 @@
*/
#include "mm/mm1/views_enh/game_view.h"
+#include "mm/mm1/views_enh/scroll_text.h"
#include "mm/mm1/mm1.h"
namespace MM {
@@ -197,6 +198,17 @@ bool GameView::tick() {
return true;
}
+void GameView::drawDialogMessage() {
+ Common::String msg = _dialogMessage;
+ msg.trim();
+ msg.setChar(toupper(msg[0]), 0); // Capitalize
+
+ ScrollText view("GameViewMessage", nullptr);
+ view.setBounds(Common::Rect(9 * 8, 8 * 8, 23 * 8, 11 * 8));
+ view.addLine(msg, MM1::ALIGN_MIDDLE);
+ view.draw();
+}
+
} // namespace ViewsEnh
} // namespace MM1
} // namespace MM
diff --git a/engines/mm/mm1/views_enh/game_view.h b/engines/mm/mm1/views_enh/game_view.h
index 7d2e3d7c032..77e0ff6310a 100644
--- a/engines/mm/mm1/views_enh/game_view.h
+++ b/engines/mm/mm1/views_enh/game_view.h
@@ -61,6 +61,12 @@ private:
*/
void showLocation(int locationId);
+protected:
+ /**
+ * Draws the dialog message
+ */
+ void drawDialogMessage() override;
+
public:
GameView(UIElement *owner) : Views::GameView(owner) {}
virtual ~GameView() {
More information about the Scummvm-git-logs
mailing list