aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Snover2017-09-23 20:05:12 -0500
committerColin Snover2017-09-23 20:57:03 -0500
commit643a572610377d36c3d43d44c7487dd15b36e5e2 (patch)
treeb56d82a9b8d73a51880241e14f5fef5aa17a1483
parentdced2fb9f54bafa0770e479e0088021f59fc0a16 (diff)
downloadscummvm-rg350-643a572610377d36c3d43d44c7487dd15b36e5e2.tar.gz
scummvm-rg350-643a572610377d36c3d43d44c7487dd15b36e5e2.tar.bz2
scummvm-rg350-643a572610377d36c3d43d44c7487dd15b36e5e2.zip
Revert "SCI: Fix Warnings about Copy Constructor Failing to Call Base Class."
This reverts commit d2dd942ad79df0c4ac9d841fb5b0919d260bb79c. The Serializable class is an interface class and has only the empty default copy constructor. There is no reason to call this explicitly. Whatever is warning about this should be fixed to stop warning about it, rather than adding such unnecessary calls to the engine code.
-rw-r--r--engines/sci/engine/segment.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/segment.h b/engines/sci/engine/segment.h
index 2b2e9466a2..d6e2dd3c24 100644
--- a/engines/sci/engine/segment.h
+++ b/engines/sci/engine/segment.h
@@ -436,7 +436,7 @@ public:
_size(0),
_data(nullptr) {}
- SciArray(const SciArray &array) : Common::Serializable() {
+ SciArray(const SciArray &array) {
_type = array._type;
_size = array._size;
_elementSize = array._elementSize;
@@ -972,7 +972,7 @@ public:
inline SciBitmap() : _data(nullptr), _dataSize(0), _gc(true) {}
- inline SciBitmap(const SciBitmap &other) : Common::Serializable() {
+ inline SciBitmap(const SciBitmap &other) {
_dataSize = other._dataSize;
_data = (byte *)malloc(other._dataSize);
memcpy(_data, other._data, other._dataSize);