[Scummvm-cvs-logs] SF.net SVN: scummvm:[46301] scummvm/trunk/engines/teenagent

[megath at users.sourceforge.net]

Revision: 46301
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46301&view=rev
Author:   megath
Date:     2009-12-08 22:13:06 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
added message duration override, increased 'the end' timeout

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/callbacks.cpp
    scummvm/trunk/engines/teenagent/scene.cpp
    scummvm/trunk/engines/teenagent/teenagent.cpp
    scummvm/trunk/engines/teenagent/teenagent.h

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2009-12-08 22:08:33 UTC (rev 46300)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2009-12-08 22:13:06 UTC (rev 46301)
@@ -3792,7 +3792,7 @@
 		playAnimation(954, 0);
 		Dialog::showMono(scene, 0x8b7a, 955, 0xe3, 1); //that's all folks
 		playMusic(2);
-		displayCredits(0xe47c);
+		displayCredits(0xe47c, 4500); //3 minutes (infinite until key pressed in original)
 		scene->push(SceneEvent(SceneEvent::kQuit));
 
 		return true;

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-12-08 22:08:33 UTC (rev 46300)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-12-08 22:13:06 UTC (rev 46301)
@@ -812,7 +812,7 @@
 						message_animation = &actor_animation;
 					debug(0, "async message %d-%d (slot %u)", message_first_frame, message_last_frame, current_event.slot);
 				} else {
-					message_timer = messageDuration(message);
+					message_timer = current_event.timer? current_event.timer: messageDuration(message);
 					message_first_frame = message_last_frame = 0;
 				}
 				Common::Point p;

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2009-12-08 22:08:33 UTC (rev 46300)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2009-12-08 22:13:06 UTC (rev 46301)
@@ -466,7 +466,7 @@
 }
 
 
-void TeenAgentEngine::displayCredits(uint16 addr) {
+void TeenAgentEngine::displayCredits(uint16 addr, uint16 timer) {
 	SceneEvent event(SceneEvent::kCreditsMessage);
 
 	const byte *src = Resources::instance()->dseg.ptr(addr);
@@ -486,6 +486,7 @@
 	}
 	int w = Resources::instance()->font8.render(NULL, 0, 0, event.message, 0xd1);
 	event.dst.x = (320 - w) / 2;
+	event.timer = timer;
 	scene->push(event);
 }
 

Modified: scummvm/trunk/engines/teenagent/teenagent.h
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.h	2009-12-08 22:08:33 UTC (rev 46300)
+++ scummvm/trunk/engines/teenagent/teenagent.h	2009-12-08 22:13:06 UTC (rev 46301)
@@ -79,7 +79,7 @@
 	void displayMessage(const Common::String &str, byte color = 0xd1, uint16 position = 0);
 	void displayAsyncMessage(uint16 addr, uint16 position, uint16 first_frame, uint16 last_frame, byte color = 0xd1);
 	void displayAsyncMessageInSlot(uint16 addr, byte slot, uint16 first_frame, uint16 last_frame, byte color = 0xd1);
-	void displayCredits(uint16 addr);
+	void displayCredits(uint16 addr, uint16 timer = 0);
 	void displayCutsceneMessage(uint16 addr, uint16 position);
 	void moveTo(const Common::Point &dst, byte o, bool warp = false);
 	void moveTo(uint16 x, uint16 y, byte o, bool warp = false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.