diff options
| author | Max Horn | 2008-05-06 15:21:46 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-06 15:21:46 +0000 |
| commit | ba6c4a6239d5496f0f218d8fa76c11e77bf9139e (patch) | |
| tree | 8c7c9d3d32b38e8ddd10499ab10e2b63b5eb8f36 /engines/gob/mult.h | |
| parent | 4331411ebea61072ff0189d7d61ac57199a120af (diff) | |
| parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
| download | scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.gz scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.tar.bz2 scummvm-rg350-ba6c4a6239d5496f0f218d8fa76c11e77bf9139e.zip | |
Merge with trunk, using the svnmerge tool
svn-id: r31898
Diffstat (limited to 'engines/gob/mult.h')
| -rw-r--r-- | engines/gob/mult.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/engines/gob/mult.h b/engines/gob/mult.h index 90f6e61f9a..c283191ec8 100644 --- a/engines/gob/mult.h +++ b/engines/gob/mult.h @@ -36,16 +36,16 @@ public: #include "common/pack-start.h" // START STRUCT PACKING struct Mult_AnimData { - uint8 animation; + int8 animation; uint8 layer; uint8 frame; int8 animType; - int8 order; + uint8 order; int8 isPaused; int8 isStatic; int8 maxTick; int8 maxFrame; - int8 newLayer; + uint8 newLayer; int8 newAnimation; byte intersected; uint8 newCycle; @@ -61,7 +61,7 @@ public: int8 stateType; int8 animTypeBak; int8 redrawAnimation; - int8 redrawLayer; + uint8 redrawLayer; uint8 redrawFrame; } PACKED_STRUCT; @@ -86,10 +86,10 @@ public: int16 lastTop; int16 lastBottom; Mult_GobState **goblinStates; - int8 goblinX; - int8 goblinY; - int8 destX; - int8 destY; + uint8 goblinX; + uint8 goblinY; + uint8 destX; + uint8 destY; int8 gobDestX; int8 gobDestY; uint8 nearestWayPoint; @@ -104,6 +104,7 @@ public: int16 newTop; int16 newRight; int16 newBottom; + uint32 videoSlot; } PACKED_STRUCT; struct Mult_StaticKey { @@ -228,7 +229,7 @@ public: int16 *_renderData; Mult_Object **_renderObjs; - int8 *_orderArray; + uint8 *_orderArray; SurfaceDesc::Ptr _animSurf; int16 _animLeft; @@ -244,6 +245,8 @@ public: void playMult(int16 startFrame, int16 endFrame, char checkEscape, char handleMouse); + void clearObjectVideos(); + virtual void loadMult(int16 resId) = 0; virtual void freeMultKeys() = 0; virtual bool hasMultData(uint16 multIndex) = 0; |