[Scummvm-git-logs] scummvm master -> 80466336af3c5a81211ae456f44dba1126e952d5

[digitall]

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

Summary:
80466336af TSAGE: Fix GCC Warning for Implicit Copy Operator


Commit: 80466336af3c5a81211ae456f44dba1126e952d5
    https://github.com/scummvm/scummvm/commit/80466336af3c5a81211ae456f44dba1126e952d5
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-27T03:27:43Z

Commit Message:
TSAGE: Fix GCC Warning for Implicit Copy Operator

This is emitted when -Wdeprecated-copy is enabled.

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/core.h


diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 50bc6e7e90..596e66e1f3 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2144,6 +2144,48 @@ SceneObject::~SceneObject() {
 	delete _objectWrapper;
 }
 
+SceneObject& SceneObject::operator=(const SceneObject &so) {
+	this->SceneHotspot::operator=(so);
+
+	_visageImages = so._visageImages;
+
+	_updateStartFrame = so._updateStartFrame;
+	_walkStartFrame = so._walkStartFrame;
+	_oldPosition = so._oldPosition;
+	_percent = so._percent;
+	_priority = so._priority;
+	_angle = so._angle;
+	_flags = so._flags;
+	_xs = so._xs;
+	_xe = so._xe;
+	for (uint i = 0; i < ARRAYSIZE(_paneRects); i++) _paneRects[i] = so._paneRects[i];
+	_visage = so._visage;
+	_objectWrapper = so._objectWrapper;
+	_strip = so._strip;
+	_animateMode = so._animateMode;
+	_frame = so._frame;
+	_endFrame = so._endFrame;
+	_loopCount = so._loopCount;
+	_frameChange = so._frameChange;
+	_numFrames = so._numFrames;
+	_regionIndex = so._regionIndex;
+	_mover = so._mover;
+	_moveDiff = so._moveDiff;
+
+	_moveRate = so._moveRate;
+	_actorDestPos = so._actorDestPos;
+	_endAction = so._endAction;
+	_regionBitList = so._regionBitList;
+
+	_shadowMap = so._shadowMap;
+	_shade = so._shade;
+	_oldShade = so._oldShade;
+	_effect = so._effect;
+	_linkedActor = so._linkedActor;
+
+	return *this;
+}
+
 int SceneObject::getNewFrame() {
 	int frameNum = _frame + _frameChange;
 
diff --git a/engines/tsage/core.h b/engines/tsage/core.h
index 15fd5c2295..43dd80bb4f 100644
--- a/engines/tsage/core.h
+++ b/engines/tsage/core.h
@@ -561,6 +561,8 @@ public:
 	SceneObject(const SceneObject &so);
 	~SceneObject() override;
 
+	SceneObject& operator=(const SceneObject &so);
+
 	void setPosition(const Common::Point &p, int yDiff = 0);
 	void setStrip(int frameNum);
 	void setStrip2(int frameNum);