From acc232718fba57c8a2e3ae8238e42daa1739525b Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Wed, 30 Apr 2008 04:39:58 +0000 Subject: [PATCH] Revert string clipping changes, as they only applied to The Dig (Second release) and COMI. svn-id: r31785 --- engines/scumm/string.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index dfaf0dc6e68..e31c3ed9c9c 100644 --- a/engines/scumm/string.cpp +++ b/engines/scumm/string.cpp @@ -485,24 +485,13 @@ void ScummEngine::CHARSET_1() { _string[0].ypos = _screenHeight - 40; } - if (_game.version >= 6) { - if (_string[0].ypos < 10) - _string[0].ypos = 10; - - 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].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; } _charset->_top = _string[0].ypos + _screenTop;