[Scummvm-cvs-logs] SF.net SVN: scummvm:[45849] scummvm/trunk/engines/draci

[spalek at users.sourceforge.net]

Revision: 45849
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45849&view=rev
Author:   spalek
Date:     2009-11-12 00:57:38 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
Subtitles are positioned correctly in the inventory

Modified Paths:
--------------
    scummvm/trunk/engines/draci/draci.h
    scummvm/trunk/engines/draci/script.cpp

Modified: scummvm/trunk/engines/draci/draci.h
===================================================================
--- scummvm/trunk/engines/draci/draci.h	2009-11-12 00:45:28 UTC (rev 45848)
+++ scummvm/trunk/engines/draci/draci.h	2009-11-12 00:57:38 UTC (rev 45849)
@@ -42,6 +42,7 @@
 #include "draci/animation.h"
 #include "draci/sound.h"
 #include "draci/music.h"
+#include "draci/walking.h"
 
 namespace Draci {
 

Modified: scummvm/trunk/engines/draci/script.cpp
===================================================================
--- scummvm/trunk/engines/draci/script.cpp	2009-11-12 00:45:28 UTC (rev 45848)
+++ scummvm/trunk/engines/draci/script.cpp	2009-11-12 00:57:38 UTC (rev 45849)
@@ -768,13 +768,16 @@
 	const uint duration = MAX(subtitleDuration, dubbingDuration);
 	_vm->_game->setSpeechTiming(_vm->_system->getMillis(), duration);
 
-	// TODO: Implement inventory part
-
 	// Set speech text coordinates
+	int x, y;
+	if (_vm->_game->getLoopStatus() == kStatusInventory) {
+		x = surface->centerOnX(160, speechFrame->getWidth());
+		y = 4;
+	} else {
+		x = surface->centerOnX(person->_x, speechFrame->getWidth());
+		y = surface->putAboveY(person->_y, speechFrame->getHeight());
+	}
 
-	int x = surface->centerOnX(person->_x, speechFrame->getWidth());
-	int y = surface->putAboveY(person->_y, speechFrame->getHeight());
-
 	speechFrame->setX(x);
 	speechFrame->setY(y);
 


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