aboutsummaryrefslogtreecommitdiff
path: root/engines/director/sprite.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-30 13:16:10 +0100
committerEugene Sandulenko2019-12-30 13:16:10 +0100
commit6810957e6db2e9f72170edbebfb11830fe519019 (patch)
treede673194832c5d3d3a4d9618f473c5843d1ace76 /engines/director/sprite.cpp
parentb6d73f54dd2c888a5ef575e6e333dc7dac2078fe (diff)
downloadscummvm-rg350-6810957e6db2e9f72170edbebfb11830fe519019.tar.gz
scummvm-rg350-6810957e6db2e9f72170edbebfb11830fe519019.tar.bz2
scummvm-rg350-6810957e6db2e9f72170edbebfb11830fe519019.zip
DIRECTOR: Simplified cast management
Diffstat (limited to 'engines/director/sprite.cpp')
-rw-r--r--engines/director/sprite.cpp20
1 files changed, 4 insertions, 16 deletions
diff --git a/engines/director/sprite.cpp b/engines/director/sprite.cpp
index da86c0cf01..3fd5b6a470 100644
--- a/engines/director/sprite.cpp
+++ b/engines/director/sprite.cpp
@@ -52,10 +52,7 @@ Sprite::Sprite() {
_stretch = 0;
_type = kInactiveSprite;
- _bitmapCast = nullptr;
- _textCast = nullptr;
- _buttonCast = nullptr;
- _shapeCast = nullptr;
+ _cast = nullptr;
_blend = 0;
_lineSize = 1;
@@ -91,10 +88,7 @@ Sprite::Sprite(const Sprite &sprite) {
_stretch = sprite._stretch;
_type = sprite._type;
- _bitmapCast = sprite._bitmapCast;
- _shapeCast = sprite._shapeCast;
- _textCast = sprite._textCast;
- _buttonCast = sprite._buttonCast;
+ _cast = sprite._cast;
_constraint = sprite._constraint;
_moveable = sprite._moveable;
@@ -110,14 +104,8 @@ Sprite::Sprite(const Sprite &sprite) {
}
Sprite::~Sprite() {
- if (_bitmapCast)
- delete _bitmapCast;
- if (_shapeCast)
- delete _shapeCast;
- if (_textCast)
- delete _textCast;
- if (_buttonCast)
- delete _buttonCast;
+ if (_cast)
+ delete _cast;
}
uint16 Sprite::getPattern() {