[Scummvm-git-logs] scummvm master -> 705dd7f9c97ce5e66c68393a794e349e7a6465ee

[sev-]

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

Summary:
418f97a952 GRAPHICS: MACGUI: Rename class variables
705dd7f9c9 NEWS: Mention Monkey Island 2 NI DOS demo support


Commit: 418f97a952cb9928dc5bc1368778b3236fa7dc8d
    https://github.com/scummvm/scummvm/commit/418f97a952cb9928dc5bc1368778b3236fa7dc8d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-20T01:13:16+01:00

Commit Message:
GRAPHICS: MACGUI: Rename class variables

Changed paths:
    graphics/macgui/mactext-canvas.cpp
    graphics/macgui/mactext-canvas.h
    graphics/macgui/mactext.cpp
    graphics/macgui/mactext.h


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index de4784292cf..e92a184a966 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -40,7 +40,7 @@ namespace Graphics {
 MacTextCanvas::~MacTextCanvas() {
 	delete _surface;
 	delete _shadowSurface;
-	delete _glyphsMask;
+	delete _glyphMask;
 	delete _charBoxMask;
 
 	for (auto &t : _text) {
@@ -645,10 +645,10 @@ void MacTextCanvas::reallocSurface() {
 	if (!_surface) {
 		_surface = new ManagedSurface(_maxWidth, _textMaxHeight, _wm->_pixelformat);
 		_charBoxMask = new ManagedSurface(_maxWidth, _textMaxHeight, Graphics::PixelFormat::createFormatCLUT8());
-		_glyphsMask = new ManagedSurface(_maxWidth, _textMaxHeight, Graphics::PixelFormat::createFormatCLUT8());
+		_glyphMask = new ManagedSurface(_maxWidth, _textMaxHeight, Graphics::PixelFormat::createFormatCLUT8());
 
 		_charBoxMask->clear(0);
-		_glyphsMask->clear(0);
+		_glyphMask->clear(0);
 
 		if (_textShadow)
 			_shadowSurface = new ManagedSurface(_maxWidth, _textMaxHeight, _wm->_pixelformat);
@@ -786,7 +786,7 @@ void MacTextCanvas::render(int from, int to) {
 	if (_textShadow)
 		render(from, to, _shadowSurface, _wm->_colorBlack);
 
-	render(from, to, _glyphsMask, 0xff);
+	render(from, to, _glyphMask, 0xff);
 	render(from, to, _charBoxMask, 0xff, true);
 	render(from, to, nullptr);
 
diff --git a/graphics/macgui/mactext-canvas.h b/graphics/macgui/mactext-canvas.h
index fdcaa7817f6..893b335597c 100644
--- a/graphics/macgui/mactext-canvas.h
+++ b/graphics/macgui/mactext-canvas.h
@@ -111,7 +111,7 @@ class MacTextCanvas {
 public:
 	Common::Array<MacTextLine> _text;
 	ManagedSurface *_surface = nullptr, *_shadowSurface = nullptr;
-	ManagedSurface *_glyphsMask = nullptr, *_charBoxMask = nullptr;
+	ManagedSurface *_glyphMask = nullptr, *_charBoxMask = nullptr;
 	int _maxWidth = 0;
 	int _textMaxWidth = 0;
 	int _textMaxHeight = 0;
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 3d5e08dc2f0..a42516edb0f 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -633,7 +633,7 @@ void MacText::setDefaultFormatting(uint16 fontId, byte textSlant, uint16 fontSiz
 void MacText::render() {
 	if (_fullRefresh) {
 		_canvas._surface->clear(_canvas._tbgcolor);
-		_canvas._glyphsMask->clear(0);
+		_canvas._glyphMask->clear(0);
 		_canvas._charBoxMask->clear(0);
 		if (_canvas._textShadow)
 			_canvas._shadowSurface->clear(_canvas._tbgcolor);
diff --git a/graphics/macgui/mactext.h b/graphics/macgui/mactext.h
index f375bc6f418..697ead43d21 100644
--- a/graphics/macgui/mactext.h
+++ b/graphics/macgui/mactext.h
@@ -75,7 +75,7 @@ public:
 	void drawToPoint(ManagedSurface *g, Common::Point dstPoint);
 
 	ManagedSurface *getSurface() { return _canvas._surface; }
-	ManagedSurface *getGlyphMask() { return _canvas._glyphsMask; }
+	ManagedSurface *getGlyphMask() { return _canvas._glyphMask; }
 	ManagedSurface *getCharBoxMask() { return _canvas._charBoxMask; }
 
 	int getInterLinear() { return _canvas._interLinear; }


Commit: 705dd7f9c97ce5e66c68393a794e349e7a6465ee
    https://github.com/scummvm/scummvm/commit/705dd7f9c97ce5e66c68393a794e349e7a6465ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-02-20T02:15:15+01:00

Commit Message:
NEWS: Mention Monkey Island 2 NI DOS demo support

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index c00e19a4609..7fbaffb8160 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -31,10 +31,13 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed skipping frames in some looping videos.
    - Fixed frame-triggered ambient sounds in scripted movies.
    - Various tweaks for displaying subtitles and inventory in widescreen mod.
-   - Fixed scaling issues for subtitles, draggable items, inventory bar and main menu in widescreen mod.
+   - Fixed scaling issues for subtitles, draggable items, inventory bar and
+     main menu in widescreen mod.
 
  SCUMM:
    - Added the original splash screens to MM NES (works only with PRG files).
+   - Added support for original playback file in Monkey Island 2 Non-Interactive
+     DOS demo.
 
  WAGE:
    - Implemented combat system.