diff options
author | Johannes Schickel | 2009-05-31 00:42:44 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-05-31 00:42:44 +0000 |
commit | bccca104d0635949d328a18d722218ba4bf59f0c (patch) | |
tree | 783e91b71af82e0ec2fa8816dc19d597beeb68c8 /engines/kyra/script_tim.h | |
parent | f2516e648ea1d7a3460895b72068b3c597f48d71 (diff) | |
download | scummvm-rg350-bccca104d0635949d328a18d722218ba4bf59f0c.tar.gz scummvm-rg350-bccca104d0635949d328a18d722218ba4bf59f0c.tar.bz2 scummvm-rg350-bccca104d0635949d328a18d722218ba4bf59f0c.zip |
- Add support for the Lands of Lore outro TIM file
- Cleanup
svn-id: r41053
Diffstat (limited to 'engines/kyra/script_tim.h')
-rw-r--r-- | engines/kyra/script_tim.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/script_tim.h b/engines/kyra/script_tim.h index 2dbfff49d4..10337b4b09 100644 --- a/engines/kyra/script_tim.h +++ b/engines/kyra/script_tim.h @@ -80,6 +80,11 @@ struct TIM { uint8 *text; const Common::Array<const TIMOpcode*> *opcodes; + + // TODO: Get rid of this ugly HACK to allow the + // Lands of Lore outro to be working properly. + bool isLoLOutro; + uint8 lolCharacter; }; class TIMInterpreter { @@ -134,6 +139,7 @@ public: void refreshTimersAfterPause(uint32 elapsedTime); void displayText(uint16 textId, int16 flags); + void displayText(uint16 textId, int16 flags, uint8 color); void setupTextPalette(uint index, int fadePalette); virtual void drawDialogueBox(int numStr, const char *s1, const char *s2, const char *s3) {} @@ -154,9 +160,6 @@ public: int _abortFlag; protected: - virtual KyraEngine_v1 *vm(); - virtual Screen_v2 *screen(); - KyraEngine_v1 *_vm; Screen_v2 *_screen; OSystem *_system; @@ -242,9 +245,6 @@ public: int resetAnimationLastPart(int animIndex); private: - KyraEngine_v1 *vm(); - Screen_v2 *screen(); - void update(); void checkSpeechProgress(); |