[Scummvm-cvs-logs] SF.net SVN: scummvm: [27410] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 27410
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27410&view=rev
Author:   thebluegr
Date:     2007-06-14 20:58:21 -0700 (Thu, 14 Jun 2007)

Log Message:
-----------
Forced text is now handled correctly. It's now possible to interact with the video screen in the elder's cave

Modified Paths:
--------------
    scummvm/trunk/engines/saga/actor.h
    scummvm/trunk/engines/saga/saga.cpp

Modified: scummvm/trunk/engines/saga/actor.h
===================================================================
--- scummvm/trunk/engines/saga/actor.h	2007-06-15 03:16:06 UTC (rev 27409)
+++ scummvm/trunk/engines/saga/actor.h	2007-06-15 03:58:21 UTC (rev 27410)
@@ -41,7 +41,7 @@
 class HitZone;
 
 
-//#define ACTOR_DEBUG //only for actor pathfinding debug!
+// #define ACTOR_DEBUG 1 //only for actor pathfinding debug!
 
 #define ACTOR_BARRIERS_MAX 16
 
@@ -97,7 +97,8 @@
 enum SpeechFlags {
 	kSpeakNoAnimate = 1,
 	kSpeakAsync = 2,
-	kSpeakSlow = 4
+	kSpeakSlow = 4,
+	kSpeakForceText = 8
 };
 
 enum ActorFrameTypes {
@@ -592,6 +593,10 @@
 		return _activeSpeech.stringsCount > 0;
 	}
 
+	int isForcedTextShown() {
+		return _activeSpeech.speechFlags & kSpeakForceText;
+	}
+
 	void saveState(Common::OutSaveFile *out);
 	void loadState(Common::InSaveFile *in);
 

Modified: scummvm/trunk/engines/saga/saga.cpp
===================================================================
--- scummvm/trunk/engines/saga/saga.cpp	2007-06-15 03:16:06 UTC (rev 27409)
+++ scummvm/trunk/engines/saga/saga.cpp	2007-06-15 03:58:21 UTC (rev 27410)
@@ -289,8 +289,8 @@
 				msec = MAX_TIME_DELTA;
 			}
 
-			// Since Puzzle is actorless, we do it here
-			if (_puzzle->isActive()) {
+			// Since Puzzle and forced text are actorless, we do them here
+			if (_puzzle->isActive() || _actor->isForcedTextShown()) {
 				_actor->handleSpeech(msec);
 			} else if (!_scene->isInIntro()) {
 				if (_interface->getMode() == kPanelMain ||


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