[Scummvm-git-logs] scummvm branch-2-9 -> ab1c8a8527512481601077183f31a76f032ffc9a

[fracturehill]

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:
e5f84137a9 NANCY: Fixup RippedLetterPuzzle fix
ab1c8a8527 NEWS: Update NANCY news


Commit: e5f84137a92315420d409f3e481f8f75d07472cf
    https://github.com/scummvm/scummvm/commit/e5f84137a92315420d409f3e481f8f75d07472cf
Author: tunnelsociety (150493071+tunnelsociety at users.noreply.github.com)
Date: 2024-12-06T11:56:01+01:00

Commit Message:
NANCY: Fixup RippedLetterPuzzle fix

If a piece is swapped with another piece, the LastPos is forgotten too soon;
after viewing an inventory item with the new piece in hand, that piece can't be
put down.

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


diff --git a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
index 59611e729f2..90a4d64b8f9 100644
--- a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
+++ b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
@@ -361,6 +361,7 @@ void RippedLetterPuzzle::handleInput(NancyInput &input) {
 						if (_puzzleState->order[i] == -1) {
 							// No, hide the picked up piece graphic
 							_pickedUpPiece.setVisible(false);
+							_puzzleState->_pickedUpPieceLastPos = -1;
 						} else {
 							// Yes, change the picked piece graphic
 							if (!_useCustomPickUpTile) {
@@ -374,7 +375,6 @@ void RippedLetterPuzzle::handleInput(NancyInput &input) {
 
 						SWAP<int8>(_puzzleState->order[i], _puzzleState->_pickedUpPieceID);
 						SWAP<byte>(_puzzleState->rotations[i], _puzzleState->_pickedUpPieceRot);
-						_puzzleState->_pickedUpPieceLastPos = -1;
 
 						// Draw the newly placed piece
 						drawPiece(i, _puzzleState->rotations[i], _puzzleState->order[i]);


Commit: ab1c8a8527512481601077183f31a76f032ffc9a
    https://github.com/scummvm/scummvm/commit/ab1c8a8527512481601077183f31a76f032ffc9a
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2024-12-06T11:56:01+01:00

Commit Message:
NEWS: Update NANCY news

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 2312bc97ad6..d8f0b77cb74 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -170,6 +170,11 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Fixed spell SP/gem requirements in MM1 enhanced mode, and actually remove
      spell points & gems when spells are cast.
 
+
+ NANCY:
+   - Fixed a startup crash and some broken puzzles in The Vampire Diaries
+   - Fixed a crash when trying to play the Russian versions of early Nancy Drew games
+
  NGI:
    - Added support for Lithuanian version of fullpipe.