aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2017-05-24 23:12:23 -0500
committerColin Snover2017-06-08 10:45:55 -0500
commit58c83dcd140137cf5c5808a95e7b0711fa556933 (patch)
tree022ced757e426daa9f9abafd82df6bb84fd261d2 /engines
parente29f60858dc4172f91d235219e76a9e13e4d72f9 (diff)
downloadscummvm-rg350-58c83dcd140137cf5c5808a95e7b0711fa556933.tar.gz
scummvm-rg350-58c83dcd140137cf5c5808a95e7b0711fa556933.tar.bz2
scummvm-rg350-58c83dcd140137cf5c5808a95e7b0711fa556933.zip
COMMON: Make SpanOwner copy assignment make a copy of the owned Span
To move data from one SpanOwner to another, use `moveFrom`. Thanks @waltervn for pointing out the problem.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/cursor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/cursor.cpp b/engines/sci/graphics/cursor.cpp
index 2a8600969e..89bb2a2307 100644
--- a/engines/sci/graphics/cursor.cpp
+++ b/engines/sci/graphics/cursor.cpp
@@ -179,7 +179,7 @@ void GfxCursor::kernelSetShape(GuiResourceId resourceId) {
Common::SpanOwner<SciSpan<byte> > upscaledBitmap;
upscaledBitmap->allocate(heightWidth * heightWidth, "upscaled cursor bitmap");
_screen->scale2x(*rawBitmap, *upscaledBitmap, SCI_CURSOR_SCI0_HEIGHTWIDTH, SCI_CURSOR_SCI0_HEIGHTWIDTH);
- rawBitmap = upscaledBitmap;
+ rawBitmap.moveFrom(upscaledBitmap);
}
if (hotspot.x >= heightWidth || hotspot.y >= heightWidth) {