[Scummvm-git-logs] scummvm master -> 2eb7929d5ee56b292749854bf12ff683f5f3eb7f

[bluegr]

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

Summary:
6822c3496c NANCY: Fix signed/unsigned warnings
59041cbaf0 NANCY: Remove unused variable
0d0fdeab6d NANCY: Fix cursor mapping in Nancy10+
2eb7929d5e NANCY: Fix top bar display in cellphone sub-screens in Nancy10+


Commit: 6822c3496cbafc29180ed3c92a627bdb06291768
    https://github.com/scummvm/scummvm/commit/6822c3496cbafc29180ed3c92a627bdb06291768
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-18T03:52:07+03:00

Commit Message:
NANCY: Fix signed/unsigned warnings

Introduced with commit 6bf575df250b31c454667a4bcd343ba7da5be5ca

Changed paths:
    engines/nancy/state/scene.h


diff --git a/engines/nancy/state/scene.h b/engines/nancy/state/scene.h
index 973ec2c28ff..8a685f55be8 100644
--- a/engines/nancy/state/scene.h
+++ b/engines/nancy/state/scene.h
@@ -137,7 +137,7 @@ public:
 	byte hasItem(int16 id) const;
 	byte getItemDisabledState(int16 id) const { return _flags.disabledItems[id]; }
 	void setItemDisabledState(int16 id, byte state) {
-		if (id < _flags.disabledItems.size())
+		if ((uint16)id < _flags.disabledItems.size())
 			_flags.disabledItems[id] = state;
 	}
 


Commit: 59041cbaf0e060b6be107d4ace22a58b37bf0fe2
    https://github.com/scummvm/scummvm/commit/59041cbaf0e060b6be107d4ace22a58b37bf0fe2
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-18T03:52:53+03:00

Commit Message:
NANCY: Remove unused variable

Changed paths:
    engines/nancy/action/puzzle/quizpuzzle.cpp


diff --git a/engines/nancy/action/puzzle/quizpuzzle.cpp b/engines/nancy/action/puzzle/quizpuzzle.cpp
index ffbd03a193c..6ab64370cc9 100644
--- a/engines/nancy/action/puzzle/quizpuzzle.cpp
+++ b/engines/nancy/action/puzzle/quizpuzzle.cpp
@@ -113,8 +113,6 @@ void QuizPuzzle::readDataOld(Common::SeekableReadStream &stream) {
 		_answerFlags[i] = stream.readSint16LE();
 	}
 
-	char textBuf[30];
-
 	_correctSound.readNormal(stream);
 	_correctText = readSubtitle(stream);
 


Commit: 0d0fdeab6d6b280928177baf77605c29e779e92c
    https://github.com/scummvm/scummvm/commit/0d0fdeab6d6b280928177baf77605c29e779e92c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-18T03:58:38+03:00

Commit Message:
NANCY: Fix cursor mapping in Nancy10+

Changed paths:
    engines/nancy/cursor.h


diff --git a/engines/nancy/cursor.h b/engines/nancy/cursor.h
index 9fdbd8f1ae0..f5529ea98c1 100644
--- a/engines/nancy/cursor.h
+++ b/engines/nancy/cursor.h
@@ -75,14 +75,14 @@ public:
 		kNewNormalArrow			= 8,	// Type 4  — Taskbar arrow
 		kNewHotspotArrow		= 9,	// Type 4  hotspot
 		kNewExit 				= 10,	// Type 5  — Exit / back movement
-		kNewRotateCW 			= 12,	// Type 6  — Puzzle rotation
-		kNewRotateCCW 			= 14,	// Type 7  — Puzzle rotation
-		kNewMoveLeft 			= 16,	// Type 8  — Movement / 360 turn
-		kNewMoveRight 			= 18,	// Type 9  — Movement / 360 turn
-		kNewMoveForward			= 20,	// Type 10 — Movement
-		kNewMoveBackward		= 22,	// Type 11 — Movement / exit puzzles
-		kNewMoveUp				= 24,	// Type 12 — Movement
-		kNewMoveDown			= 26,	// Type 13 — Movement
+		kNewMoveLeft 			= 12,	// Type 6  — Movement / 360 turn
+		kNewMoveRight 			= 14,	// Type 7  — Movement / 360 turn
+		kNewMoveForward			= 16,	// Type 8  — Movement
+		kNewMoveBackward		= 18,	// Type 9  — Movement / exit puzzles
+		kNewMoveUp				= 20,	// Type 10 — Movement
+		kNewMoveDown			= 22,	// Type 11 — Movement
+		kNewRotateCW 			= 24,	// Type 12 — Puzzle rotation
+		kNewRotateCCW 			= 26,	// Type 13 — Puzzle rotation
 		kNewRotateRight			= 28,	// Type 14 — 360 scenes
 		kNewRotateLeft			= 30,	// Type 15 — 360 scenes
 		kNewInvertedRotateRight = 32,	// Type 16 — Inverted 360 rotation


Commit: 2eb7929d5ee56b292749854bf12ff683f5f3eb7f
    https://github.com/scummvm/scummvm/commit/2eb7929d5ee56b292749854bf12ff683f5f3eb7f
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-18T04:01:08+03:00

Commit Message:
NANCY: Fix top bar display in cellphone sub-screens in Nancy10+

Changed paths:
    engines/nancy/ui/cellphonepopup.cpp
    engines/nancy/ui/cellphonepopup.h


diff --git a/engines/nancy/ui/cellphonepopup.cpp b/engines/nancy/ui/cellphonepopup.cpp
index a54f29f84a6..98545399992 100644
--- a/engines/nancy/ui/cellphonepopup.cpp
+++ b/engines/nancy/ui/cellphonepopup.cpp
@@ -410,14 +410,16 @@ void CellPhonePopup::drawChrome() {
 			: _uiclData->header.normalSrcRect;
 	_drawSurface.blitFrom(_overlayImage, chromeSrc, Common::Point(0, 0));
 	drawCloseButton(_closeButtonHovered ? 1 : 0);
-	drawHelpButton(0);
+	if (!isSubScreenState()) {
+		drawHelpButton(0);
+	}
 	_needsRedraw = true;
 }
 
 void CellPhonePopup::drawScreenContent() {
 	drawChrome();
 
-	if (_screenState != kConnected) {
+	if (_screenState != kConnected && !isSubScreenState()) {
 		drawStatusIcons();
 	}
 
@@ -1511,9 +1513,10 @@ void CellPhonePopup::handleInput(NancyInput &input) {
 		drawScreenContent();
 	}
 
-	// Help "?" button: opens the help page in the content view. Reachable
-	// from any interactive state (except when already showing it).
-	if (!_uiclData->helpButton.destRect.isEmpty() && !_uiclData->helpTextKey.empty() &&
+	// Help "?" button: opens the help page in the content view. Hidden
+	// (and unclickable) on sub-screens that already show their own heading.
+	if (!isSubScreenState() &&
+			!_uiclData->helpButton.destRect.isEmpty() && !_uiclData->helpTextKey.empty() &&
 			!(_screenState == kContentView && _contentKey == _uiclData->helpTextKey) &&
 			_uiclData->helpButton.destRect.contains(chunkMouse)) {
 		g_nancy->_cursor->setCursorType(CursorManager::kHotspotArrow);
diff --git a/engines/nancy/ui/cellphonepopup.h b/engines/nancy/ui/cellphonepopup.h
index f60f94a463c..46a8517fc96 100644
--- a/engines/nancy/ui/cellphonepopup.h
+++ b/engines/nancy/ui/cellphonepopup.h
@@ -138,6 +138,14 @@ private:
 				_screenState == kContentView;
 	}
 
+	// True for screens that hide the status icons and "?" button so the
+	// top bar shows only the section heading and the up arrow.
+	bool isSubScreenState() const {
+		return _screenState == kDirectory ||
+				_screenState == kOnlineHub ||
+				isZoomedChromeState();
+	}
+
 	void resetDialPad();
 	void enterScreenState(ScreenState newState);
 	void appendDigit(byte slotIndex);