[Scummvm-git-logs] scummvm master -> 273e6b9a26ba96ac3fe5505cd2162e616ab8d3de

[sev-]

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:
273e6b9a26 NANCY: Fix warnings about deprecated ManagedSurface copy constructor


Commit: 273e6b9a26ba96ac3fe5505cd2162e616ab8d3de
    https://github.com/scummvm/scummvm/commit/273e6b9a26ba96ac3fe5505cd2162e616ab8d3de
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-04-06T01:10:49+02:00

Commit Message:
NANCY: Fix warnings about deprecated ManagedSurface copy constructor

Changed paths:
    engines/nancy/action/actionrecord.h
    engines/nancy/action/puzzle/assemblypuzzle.h
    engines/nancy/action/puzzle/collisionpuzzle.cpp
    engines/nancy/action/puzzle/collisionpuzzle.h
    engines/nancy/action/puzzle/mazechasepuzzle.h
    engines/nancy/action/puzzle/tangrampuzzle.h
    engines/nancy/font.h
    engines/nancy/misc/mousefollow.h
    engines/nancy/misc/specialeffect.h
    engines/nancy/renderobject.h


diff --git a/engines/nancy/action/actionrecord.h b/engines/nancy/action/actionrecord.h
index 7cb72f8da14..18c71a1e77a 100644
--- a/engines/nancy/action/actionrecord.h
+++ b/engines/nancy/action/actionrecord.h
@@ -151,6 +151,8 @@ public:
 	RenderActionRecord(uint zOrder) : RenderObject(zOrder) {}
 	virtual ~RenderActionRecord() {}
 
+	RenderActionRecord(RenderActionRecord &&) = default;
+
 	// This makes sure the AR is re-added to the render system
 	// when returning from a different state (e.g. the Help screen)
 	void onPause(bool pause) override { if (!pause) registerGraphics(); }
diff --git a/engines/nancy/action/puzzle/assemblypuzzle.h b/engines/nancy/action/puzzle/assemblypuzzle.h
index c75400f42d3..b24756e5de9 100644
--- a/engines/nancy/action/puzzle/assemblypuzzle.h
+++ b/engines/nancy/action/puzzle/assemblypuzzle.h
@@ -38,6 +38,8 @@ public:
 	AssemblyPuzzle() : RenderActionRecord(7) {}
 	virtual ~AssemblyPuzzle() {}
 
+	AssemblyPuzzle(AssemblyPuzzle &&) = default;
+
 	void init() override;
 	void registerGraphics() override;
 
diff --git a/engines/nancy/action/puzzle/collisionpuzzle.cpp b/engines/nancy/action/puzzle/collisionpuzzle.cpp
index a06f391dfa5..8de4dc95f53 100644
--- a/engines/nancy/action/puzzle/collisionpuzzle.cpp
+++ b/engines/nancy/action/puzzle/collisionpuzzle.cpp
@@ -45,7 +45,7 @@ void CollisionPuzzle::init() {
 	_image.setTransparentColor(_drawSurface.getTransparentColor());
 
 	if (_puzzleType == kCollision) {
-		_pieces.resize(_pieceSrcs.size(), Piece());
+		_pieces.resize(_pieceSrcs.size());
 		for (uint i = 0; i < _pieceSrcs.size(); ++i) {
 			_pieces[i]._drawSurface.create(_image, _pieceSrcs[i]);
 			Common::Rect pos = getScreenPosition(_startLocations[i]);
@@ -105,9 +105,9 @@ void CollisionPuzzle::init() {
 
 				if (id == 6) {
 					// The solve piece is pushed to the front
-					_pieces.insert_at(0, newPiece);
+					_pieces.emplace(_pieces.begin(), Common::move(newPiece));
 				} else {
-					_pieces.push_back(newPiece);
+					_pieces.push_back(Common::move(newPiece));
 				}
 			}
 		}
diff --git a/engines/nancy/action/puzzle/collisionpuzzle.h b/engines/nancy/action/puzzle/collisionpuzzle.h
index db6b3024fac..e4146f240d2 100644
--- a/engines/nancy/action/puzzle/collisionpuzzle.h
+++ b/engines/nancy/action/puzzle/collisionpuzzle.h
@@ -58,6 +58,8 @@ protected:
 		Piece() : RenderObject(9) {}
 		virtual ~Piece() {}
 
+		Piece(Piece &&) = default;
+
 		Common::Point _gridPos;
 		uint _w = 1;
 		uint _h = 1;
diff --git a/engines/nancy/action/puzzle/mazechasepuzzle.h b/engines/nancy/action/puzzle/mazechasepuzzle.h
index b154d319e2f..4b62b479319 100644
--- a/engines/nancy/action/puzzle/mazechasepuzzle.h
+++ b/engines/nancy/action/puzzle/mazechasepuzzle.h
@@ -53,6 +53,8 @@ protected:
 		Piece(uint z) : RenderObject(z) {}
 		virtual ~Piece() {}
 
+		Piece(Piece &&) = default;
+
 		Common::Point _gridPos;
 		Common::Point _lastPos;
 
diff --git a/engines/nancy/action/puzzle/tangrampuzzle.h b/engines/nancy/action/puzzle/tangrampuzzle.h
index c067ced8ced..e101f05ad34 100644
--- a/engines/nancy/action/puzzle/tangrampuzzle.h
+++ b/engines/nancy/action/puzzle/tangrampuzzle.h
@@ -53,6 +53,8 @@ protected:
 		Tile();
 		virtual ~Tile();
 
+		Tile(Tile &&) = default;
+
 		void drawMask();
 		void setHighlighted(bool highlighted);
 
diff --git a/engines/nancy/font.h b/engines/nancy/font.h
index e30c36aed67..9ebab817312 100644
--- a/engines/nancy/font.h
+++ b/engines/nancy/font.h
@@ -39,6 +39,8 @@ public:
 	Font() = default;
 	~Font() = default;
 
+	Font(Font &&) = default;
+
 	void read(Common::SeekableReadStream &stream);
 
 	int getFontHeight() const override { return _fontHeight - 1; }
diff --git a/engines/nancy/misc/mousefollow.h b/engines/nancy/misc/mousefollow.h
index 3d1289b345c..f46144c3156 100644
--- a/engines/nancy/misc/mousefollow.h
+++ b/engines/nancy/misc/mousefollow.h
@@ -44,6 +44,8 @@ public:
 	MouseFollowObject();
 	virtual ~MouseFollowObject() {}
 
+	MouseFollowObject(MouseFollowObject &&) = default;
+
 	virtual void pickUp() { _isPickedUp = true; }
 	virtual void putDown() { _isPickedUp = false; }
 
diff --git a/engines/nancy/misc/specialeffect.h b/engines/nancy/misc/specialeffect.h
index 3992261ad38..85b9c7b66be 100644
--- a/engines/nancy/misc/specialeffect.h
+++ b/engines/nancy/misc/specialeffect.h
@@ -51,6 +51,8 @@ public:
 		_rect(rect) {}
 	virtual ~SpecialEffect() {}
 
+	SpecialEffect(SpecialEffect &&) = default;
+
 	void init() override;
 	void updateGraphics() override;
 
diff --git a/engines/nancy/renderobject.h b/engines/nancy/renderobject.h
index 374842aaf0b..790ff4bfcd6 100644
--- a/engines/nancy/renderobject.h
+++ b/engines/nancy/renderobject.h
@@ -41,6 +41,8 @@ public:
 
 	virtual ~RenderObject();
 
+	RenderObject(RenderObject &&) = default;
+
 	virtual void init(); // Does not get called automatically
 	virtual void registerGraphics(); // Does not get called automatically
 	virtual void updateGraphics() {}