aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorDmitry Iskrich2016-08-06 19:15:26 +0300
committerEugene Sandulenko2016-08-06 21:36:07 +0200
commit29faa282640a558efe22f2b0d1da444e19d604fe (patch)
tree5387726ce9f57503ea7dd6ef817b03451cce493f /engines
parent0204628f2692b79572ba477777605bbe8328fed8 (diff)
downloadscummvm-rg350-29faa282640a558efe22f2b0d1da444e19d604fe.tar.gz
scummvm-rg350-29faa282640a558efe22f2b0d1da444e19d604fe.tar.bz2
scummvm-rg350-29faa282640a558efe22f2b0d1da444e19d604fe.zip
DIRECTOR: Change sprite type
Diffstat (limited to 'engines')
-rw-r--r--engines/director/lingo/lingo-the.cpp2
-rw-r--r--engines/director/score.cpp2
-rw-r--r--engines/director/score.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp
index 2aedf32a54..3f4f9cc432 100644
--- a/engines/director/lingo/lingo-the.cpp
+++ b/engines/director/lingo/lingo-the.cpp
@@ -271,7 +271,7 @@ void Lingo::setTheSprite(Datum &id1, int field, Datum &d) {
sprite->_visible = (d.u.i == 0 ? false : true);
break;
case kTheType:
- sprite->_type = d.u.i;
+ sprite->_type = static_cast<SpriteType>(d.u.i);
break;
case kTheMovieRate:
sprite->_movieRate = d.u.i;
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 161bc86768..9b42f6e257 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1584,7 +1584,7 @@ Sprite::Sprite() {
_stopTime = 0;
_volume = 0;
_stretch = 0;
- _type = 0;
+ _type = kInactiveSprite;
}
Sprite::Sprite(const Sprite &sprite) {
diff --git a/engines/director/score.h b/engines/director/score.h
index d483afab1c..a7ca59b475 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -315,7 +315,7 @@ public:
uint16 _bottom;
byte _blend;
bool _visible;
- byte _type;
+ SpriteType _type;
//Using in digital movie sprites
byte _movieRate;
uint16 _movieTime;