From 4e02acec85a5844def84e8092e543e4e7c710092 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 22 Jul 2010 21:46:17 +0000 Subject: KYRA: Implement proper fade out when skipping the intro at any position. svn-id: r51172 --- engines/kyra/kyra_lok.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index c0c9bf06c4..5e32f3fd05 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -132,7 +132,7 @@ public: int _paletteChanged; int16 _northExitHeight; - typedef void (KyraEngine_LoK::*IntroProc)(); + typedef bool (KyraEngine_LoK::*IntroProc)(); // static data access const char * const *seqWSATable() { return _seq_WSATable; } @@ -157,11 +157,11 @@ protected: // -> intro void seq_intro(); - void seq_introLogos(); - void seq_introStory(); - void seq_introMalcolmTree(); - void seq_introKallakWriting(); - void seq_introKallakMalcolm(); + bool seq_introLogos(); + bool seq_introStory(); + bool seq_introMalcolmTree(); + bool seq_introKallakWriting(); + bool seq_introKallakMalcolm(); // -> ingame animations void seq_createAmuletJewel(int jewel, int page, int noSound, int drawOnly); -- cgit v1.2.3 From d77649828237a71f383b791f9ae87c17c8cc67bc Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 22 Jul 2010 21:46:39 +0000 Subject: KYRA: Cleanup. svn-id: r51173 --- engines/kyra/kyra_lok.h | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 5e32f3fd05..239ca26a11 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -157,6 +157,7 @@ protected: // -> intro void seq_intro(); + bool seq_introPublisherLogos(); bool seq_introLogos(); bool seq_introStory(); bool seq_introMalcolmTree(); -- cgit v1.2.3 From 4b2fca203e19b831b76a7d0ec0ee3c5235ed89ee Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 22 Jul 2010 23:16:33 +0000 Subject: KYRA: Implement missing dialog code. This finally enables animations for all of Darm's talk sequences. svn-id: r51179 --- engines/kyra/kyra_lok.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 239ca26a11..9f1eb282f5 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -473,6 +473,8 @@ protected: int8 _charSayUnk2; int8 _charSayUnk3; int8 _currHeadShape; + int8 _disabledTalkAnimObject; + int8 _enabledTalkAnimObject; uint8 _currSentenceColor[3]; int8 _startSentencePalIndex; bool _fadeText; -- cgit v1.2.3 From 795062d8e75851d8d5ac337edaa55834cfc6adee Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 23 Jul 2010 00:12:29 +0000 Subject: KYRA: Cleanup. svn-id: r51181 --- engines/kyra/kyra_lok.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index 9f1eb282f5..aa28c70410 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -374,16 +374,14 @@ protected: //void setTimer19(); void setupTimers(); void timerUpdateHeadAnims(int timerNum); - void timerSetFlags1(int timerNum); - void timerSetFlags2(int timerNum); - void timerSetFlags3(int timerNum); - void timerCheckAnimFlag1(int timerNum); - void timerCheckAnimFlag2(int timerNum); + void timerTulipCreator(int timerNum); + void timerAsInvisibleTimeout(int timerNum); + void timerAsWillowispTimeout(int timerNum); void checkAmuletAnimFlags(); void timerRedrawAmulet(int timerNum); void timerFadeText(int timerNum); - void updateAnimFlag1(int timerNum); - void updateAnimFlag2(int timerNum); + void timerWillowispFrameTimer(int timerNum); + void timerInvisibleFrameTimer(int timerNum); void drawAmulet(); void setTextFadeTimerCountdown(int16 countdown); void setWalkspeed(uint8 newSpeed); -- cgit v1.2.3 From 6cf1b59742fda8dbed4df8750eba1569dd2e6315 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 23 Jul 2010 00:12:52 +0000 Subject: KYRA: Implemented some missing timers for object creation. svn-id: r51182 --- engines/kyra/kyra_lok.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index aa28c70410..e6e88f7649 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -375,10 +375,14 @@ protected: void setupTimers(); void timerUpdateHeadAnims(int timerNum); void timerTulipCreator(int timerNum); + void timerRubyCreator(int timerNum); void timerAsInvisibleTimeout(int timerNum); void timerAsWillowispTimeout(int timerNum); void checkAmuletAnimFlags(); void timerRedrawAmulet(int timerNum); + void timerLavenderRoseCreator(int timerNum); + void timerAcornCreator(int timerNum); + void timerBlueberryCreator(int timerNum); void timerFadeText(int timerNum); void timerWillowispFrameTimer(int timerNum); void timerInvisibleFrameTimer(int timerNum); -- cgit v1.2.3 From ba8ec806ba2746210217950b12c6dce9a5bb1696 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Fri, 23 Jul 2010 00:13:21 +0000 Subject: KYRA: Cleanup. svn-id: r51183 --- engines/kyra/kyra_lok.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'engines/kyra/kyra_lok.h') diff --git a/engines/kyra/kyra_lok.h b/engines/kyra/kyra_lok.h index e6e88f7649..b37a14bad4 100644 --- a/engines/kyra/kyra_lok.h +++ b/engines/kyra/kyra_lok.h @@ -390,6 +390,8 @@ protected: void setTextFadeTimerCountdown(int16 countdown); void setWalkspeed(uint8 newSpeed); + void setItemCreationFlags(int offset, int count); + int buttonInventoryCallback(Button *caller); int buttonAmuletCallback(Button *caller); -- cgit v1.2.3