[Scummvm-git-logs] scummvm master -> dd2db0533f77c3d6c785f5cddd064b36e60350f1
bluegr
noreply at scummvm.org
Sun Apr 5 20:59:48 UTC 2026
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:
dd2db0533f MM: Fix warnings about deprecated ManagedSurface copy constructor
Commit: dd2db0533f77c3d6c785f5cddd064b36e60350f1
https://github.com/scummvm/scummvm/commit/dd2db0533f77c3d6c785f5cddd064b36e60350f1
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2026-04-05T23:59:43+03:00
Commit Message:
MM: Fix warnings about deprecated ManagedSurface copy constructor
Changed paths:
engines/mm/shared/xeen/sprites.cpp
engines/mm/shared/xeen/sprites.h
diff --git a/engines/mm/shared/xeen/sprites.cpp b/engines/mm/shared/xeen/sprites.cpp
index 26733654ea9..6ea413b5019 100644
--- a/engines/mm/shared/xeen/sprites.cpp
+++ b/engines/mm/shared/xeen/sprites.cpp
@@ -66,8 +66,11 @@ void SpriteResource::copy(const SpriteResource &src) {
Common::copy(src._data, src._data + _filesize, _data);
_index.resize(src._index.size());
- for (uint i = 0; i < src._index.size(); ++i)
- _index[i] = src._index[i];
+ for (uint i = 0; i < src._index.size(); ++i) {
+ _index[i]._offset1 = src._index[i]._offset1;
+ _index[i]._offset2 = src._index[i]._offset2;
+ _index[i]._override.copyFrom(src._index[i]._override);
+ }
}
SpriteResource &SpriteResource::operator=(const SpriteResource &src) {
diff --git a/engines/mm/shared/xeen/sprites.h b/engines/mm/shared/xeen/sprites.h
index 7a87ad4909e..be486a909b5 100644
--- a/engines/mm/shared/xeen/sprites.h
+++ b/engines/mm/shared/xeen/sprites.h
@@ -56,7 +56,6 @@ protected:
Graphics::ManagedSurface _override;
};
Common::Array<IndexEntry> _index;
- Common::Array<Graphics::ManagedSurface> _overrides;
size_t _filesize;
byte *_data;
Common::Path _filename;
More information about the Scummvm-git-logs
mailing list