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

[dreammaster]

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:
f83b52c1a6 MM: MM1: Cleanup of changes for new gfx display


Commit: f83b52c1a62b8d2427f69635eda85fa588ef0522
    https://github.com/scummvm/scummvm/commit/f83b52c1a62b8d2427f69635eda85fa588ef0522
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-01-20T20:34:42+11:00

Commit Message:
MM: MM1: Cleanup of changes for new gfx display

This wraps the existing changes I did in a define so we can
easily revert them if the new graphics aren't ready by the
next release. Additionally, it also fixes the combat view
to correctly use whichever designated background color is set.

Changed paths:
    engines/mm/mm1/views_enh/combat.cpp
    engines/mm/mm1/views_enh/scroll_view.cpp
    engines/mm/mm1/views_enh/scroll_view.h
    engines/mm/mm1/views_enh/text_view.h


diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index ef0801c4d92..58634ab3d02 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -544,7 +544,7 @@ void Combat::clearArea(const Common::Rect &r) {
 	area.right = MIN(area.right, _innerBounds.right);
 	area.bottom = MIN(area.bottom, _innerBounds.bottom);
 
-	s.fillRect(area, 0x99);
+	s.fillRect(area, SCROLL_BG_COLOR);
 }
 
 
diff --git a/engines/mm/mm1/views_enh/scroll_view.cpp b/engines/mm/mm1/views_enh/scroll_view.cpp
index 1606b302fdc..1788e2518b9 100644
--- a/engines/mm/mm1/views_enh/scroll_view.cpp
+++ b/engines/mm/mm1/views_enh/scroll_view.cpp
@@ -167,7 +167,7 @@ void ScrollView::frame() {
 void ScrollView::fill() {
 	Graphics::ManagedSurface s = getSurface();
 	s.fillRect(Common::Rect(FRAME_BORDER_SIZE, FRAME_BORDER_SIZE,
-		s.w - FRAME_BORDER_SIZE, s.h - FRAME_BORDER_SIZE), 0);
+		s.w - FRAME_BORDER_SIZE, s.h - FRAME_BORDER_SIZE), SCROLL_BG_COLOR);
 }
 
 void ScrollView::writeSymbol(int symbolId) {
diff --git a/engines/mm/mm1/views_enh/scroll_view.h b/engines/mm/mm1/views_enh/scroll_view.h
index eb50b8340de..ec1aaf4748f 100644
--- a/engines/mm/mm1/views_enh/scroll_view.h
+++ b/engines/mm/mm1/views_enh/scroll_view.h
@@ -32,6 +32,12 @@ namespace ViewsEnh {
 #define GLYPH_W 24
 #define GLYPH_H 20
 
+#ifdef MM1_NEW_GFX
+constexpr int SCROLL_BG_COLOR = 0;
+#else
+constexpr int SCROLL_BG_COLOR = 153;
+#endif
+
 class ScrollView : public TextView {
 	struct Button {
 		Shared::Xeen::SpriteResource *_sprites;
diff --git a/engines/mm/mm1/views_enh/text_view.h b/engines/mm/mm1/views_enh/text_view.h
index e8e770f7ce2..a90ec2890d9 100644
--- a/engines/mm/mm1/views_enh/text_view.h
+++ b/engines/mm/mm1/views_enh/text_view.h
@@ -30,6 +30,15 @@ namespace MM {
 namespace MM1 {
 namespace ViewsEnh {
 
+#define MM1_NEW_GFX
+
+#ifdef MM1_NEW_GFX
+constexpr int TEXT_COLOR = 9;
+#else
+constexpr int TEXT_COLOR = 0xff;
+#endif
+
+
 class TextView : public UIElement {
 private:
 	XeenFont *getFont() const;