diff options
| author | Gregory Montoir | 2004-04-06 20:15:19 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-04-06 20:15:19 +0000 |
| commit | 4fef6d8972cf34f0c6ea709b801183df65757b7f (patch) | |
| tree | f4526de9e07783078bfe48de7cf5ce9ab4039e14 /queen/graphics.h | |
| parent | 36d667b2b599a8c58c7e0d52e47afc2a3f828ea0 (diff) | |
| download | scummvm-rg350-4fef6d8972cf34f0c6ea709b801183df65757b7f.tar.gz scummvm-rg350-4fef6d8972cf34f0c6ea709b801183df65757b7f.tar.bz2 scummvm-rg350-4fef6d8972cf34f0c6ea709b801183df65757b7f.zip | |
fix for bug #928549.
Animations on objects/persons setup by cutaways can still be played after the end of the cutscene. (the only ?) one room in which this is reproducable is the first time you talk to the Oracle (first c44, then c47).
As a Cutaway object is created for each cutscene, the _cutAnim member should be moved to an more "persistant" object.
Otherwise we're reading data from free'd memory...
svn-id: r13488
Diffstat (limited to 'queen/graphics.h')
| -rw-r--r-- | queen/graphics.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/queen/graphics.h b/queen/graphics.h index 68360bd381..1e54ccd49f 100644 --- a/queen/graphics.h +++ b/queen/graphics.h @@ -115,6 +115,7 @@ public: void setupNewRoom(const char *room, uint16 roomNum, int16 *furniture, uint16 furnitureCount); + void setBobCutawayAnim(uint16 bobNum, bool xflip, const AnimFrame *af, uint8 frameCount); void fillAnimBuffer(const char *anim, AnimFrame *af); uint16 countAnimFrames(const char *anim); void setupObjectAnim(const GraphicData *gd, uint16 firstImage, uint16 bobNum, bool visible); @@ -165,8 +166,12 @@ private: //! used to scale a BobFrame BobFrame _shrinkBuffer; + //! in-game objects/persons animations AnimFrame _newAnim[17][30]; + //! cutaway objects/persons animations + AnimFrame _cutAnim[21][30]; + uint16 _personFrames[4]; //! Number of animated furniture in current room |