diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /engines/mads/scene.h | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'engines/mads/scene.h')
| -rw-r--r-- | engines/mads/scene.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/engines/mads/scene.h b/engines/mads/scene.h index c0784c3812..79e0fd4029 100644 --- a/engines/mads/scene.h +++ b/engines/mads/scene.h @@ -111,7 +111,7 @@ public: Common::Array<PaletteCycle> _paletteCycles; Common::StringArray _vocabStrings; Animation *_animationData; - Animation *_activeAnimation; + Animation *_animation[10]; bool _freeAnimationFlag; int _depthStyle; int _bandsRange; @@ -128,7 +128,6 @@ public: Common::Point _customDest; Common::Array<PaletteUsage::UsageEntry> _paletteUsageF; Common::Array<PaletteUsage::UsageEntry> _scenePaletteUsage; - /** * Constructor */ @@ -214,7 +213,7 @@ public: /** * Load an animation */ - void loadAnimation(const Common::String &resName, int trigger = 0); + int loadAnimation(const Common::String &resName, int trigger = 0); /** * Returns a vocab entry @@ -245,9 +244,28 @@ public: void freeAnimation(); /** + * Frees any given active animation for the scene + */ + void freeAnimation(int idx); + + /** * Synchronize the game */ void synchronize(Common::Serializer &s); + + void setAnimFrame(int id, int val); + int getAnimFrame(int id); + + void setDynamicAnim(int id, int anim_id, int segment); + void setCamera(Common::Point pos); + void drawToBackground(int spriteId, int frameId, Common::Point pos, int depth, int scale); + void deleteSequence(int idx); + void loadSpeech(int idx); + void playSpeech(int idx); + void sceneScale(int yFront, int maxScale, int yBack, int minScale); + void animations_tick(); + + int _speechReady; }; } // End of namespace MADS |