diff options
author | Dmitry Iskrich | 2016-06-08 15:50:21 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2016-08-03 23:40:36 +0200 |
commit | d01fddfa6b39afa897cb1e1d694db127298da5cc (patch) | |
tree | 5a0966c973c5fdf6618f8eeb8be96f542dd71294 /engines/director | |
parent | 1099838bbd5580019d164cdeebc22d9228f995a5 (diff) | |
download | scummvm-rg350-d01fddfa6b39afa897cb1e1d694db127298da5cc.tar.gz scummvm-rg350-d01fddfa6b39afa897cb1e1d694db127298da5cc.tar.bz2 scummvm-rg350-d01fddfa6b39afa897cb1e1d694db127298da5cc.zip |
DIRECTOR: Add transition types
Diffstat (limited to 'engines/director')
-rw-r--r-- | engines/director/score.cpp | 3 | ||||
-rw-r--r-- | engines/director/score.h | 57 |
2 files changed, 58 insertions, 2 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp index beb0c9774f..bc79ee9222 100644 --- a/engines/director/score.cpp +++ b/engines/director/score.cpp @@ -475,6 +475,7 @@ Frame::Frame(const Frame &frame) { _actionId = frame._actionId; _transFlags = frame._transFlags; _transType = frame._transType; + _transChunkSize = frame._transChunkSize; _tempo = frame._tempo; _sound1 = frame._sound1; _sound2 = frame._sound2; @@ -542,7 +543,7 @@ void Frame::readMainChannels(Common::SeekableReadStream &stream, uint16 offset, offset++; break; case kTransTypePosition: - _transType = stream.readByte(); + _transType = static_cast<transitionType>(stream.readByte()); offset++; break; case kSound1Position: diff --git a/engines/director/score.h b/engines/director/score.h index 60fa0e76d7..09e3377e8a 100644 --- a/engines/director/score.h +++ b/engines/director/score.h @@ -103,6 +103,61 @@ enum scriptType { kFrameScript }; +enum transitionType { + kTransWipeRight = 1, + kTransWipeLeft, + kTransWipeDown, + kTransWipeUp, + kTransCenterOutHorizontal, + kTransEdgesInHorizontal, + kTransCenterOutVertical, + kTransEdgesInVertical, + kTransCenterOutSquare, + kTransEdgesInSquare, + kTransPushLeft, + kTransPushRight, + kTransPushDown, + kTransPushUp, + kTransRevealUp, + kTransRevealUpRight, + kTransRevealRight, + kTransRevealDown, + kTransRevealDownRight, + kTransRevealDownLeft, + kTransRevealLeft, + kTransRevealUpLeft, + kTransDisolvePixelsFast, + kTransDisolveBoxyRects, + kTransDisolveBoxySquares, + kTransDisolvePatterns, + kTransRandomRows, + kTransRandomColumns, + kTransCoverDown, + kTransCoverDownLeft, + kTransCoverDownRight, + kTransCoverLeft, + kTransCoverRight, + kTransCoverUp, + kTransCoverUpLeft, + kTransCoverUpRight, + kTransTypeVenitianBlind, + kTransTypeCheckerboard, + kTransTypeStripsBottomBuildLeft, + kTransTypeStripsBottomBuildRight, + kTransTypeStripsLeftBuildDown, + kTransTypeStripsLeftBuildUp, + kTransTypeStripsRightBuildDown, + kTransTypeStripsRightBuildUp, + kTransTypeStripsTopBuildLeft, + kTransTypeStripsTopBuildRight, + kTransZoomOpen, + kTransZoomClose, + kTransVerticalBinds, + kTransDisolveBitsTrans, + kTransDisolvePixels, + kTransDisolveBits +}; + struct Cast { castType type; Common::Rect initialRect; @@ -186,7 +241,7 @@ public: uint8 _actionId; uint8 _transFlags; uint8 _transChunkSize; - uint8 _transType; + transitionType _transType; uint8 _tempo; uint16 _sound1; |