[Scummvm-cvs-logs] SF.net SVN: scummvm: [31785] scummvm/trunk/engines/scumm/string.cpp

[Kirben at users.sourceforge.net]

Revision: 31785
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31785&view=rev
Author:   Kirben
Date:     2008-04-29 21:39:58 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Revert string clipping changes, as they only applied to The Dig (Second release) and COMI.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/string.cpp

Modified: scummvm/trunk/engines/scumm/string.cpp
===================================================================
--- scummvm/trunk/engines/scumm/string.cpp	2008-04-30 04:38:29 UTC (rev 31784)
+++ scummvm/trunk/engines/scumm/string.cpp	2008-04-30 04:39:58 UTC (rev 31785)
@@ -485,24 +485,13 @@
 				_string[0].ypos = _screenHeight - 40;
 		}
 
-		if (_game.version >= 6) {
-			if (_string[0].ypos < 10)
-				_string[0].ypos = 10;
+		if (_string[0].ypos < 1)
+			_string[0].ypos = 1;
 
-			if (_string[0].xpos < 5)
-				_string[0].xpos = 5;
-			if (_string[0].xpos > _screenWidth - 10)
-				_string[0].xpos = _screenWidth - 10;
-		} else {
-			if (_string[0].ypos < 1)
-				_string[0].ypos = 1;
-
-			if (_string[0].xpos < 80)
-				_string[0].xpos = 80;
-			if (_string[0].xpos > _screenWidth - 80)
-				_string[0].xpos = _screenWidth - 80;
-		}
-
+		if (_string[0].xpos < 80)
+			_string[0].xpos = 80;
+		if (_string[0].xpos > _screenWidth - 80)
+			_string[0].xpos = _screenWidth - 80;
 	}
 
 	_charset->_top = _string[0].ypos + _screenTop;


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