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

[thebluegr at users.sourceforge.net]

Revision: 27397
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27397&view=rev
Author:   thebluegr
Date:     2007-06-13 21:22:23 -0700 (Wed, 13 Jun 2007)

Log Message:
-----------
SAGA: Added sanity checks for speech box coordinates, like the original. Now, there won't be missing subtitles in certain scenes

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

Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp	2007-06-13 22:23:12 UTC (rev 27396)
+++ scummvm/trunk/engines/saga/actor.cpp	2007-06-14 04:22:23 UTC (rev 27397)
@@ -1213,7 +1213,10 @@
 				}
 
 				height2 = actor->_screenPosition.y - 50;
-				_activeSpeech.speechBox.top = _activeSpeech.drawRect.top = MAX(10, (height2 - height) / 2);
+				if (height2 > _vm->_scene->getHeight())
+					_activeSpeech.speechBox.top = _activeSpeech.drawRect.top = _vm->_scene->getHeight() - 1 - height - 10;
+				else
+					_activeSpeech.speechBox.top = _activeSpeech.drawRect.top = MAX(10, (height2 - height) / 2);
 			} else {
 				_activeSpeech.drawRect.left = _activeSpeech.speechBox.left;
 				_activeSpeech.drawRect.top = _activeSpeech.speechBox.top + (_activeSpeech.speechBox.height() - height) / 2;


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