diff options
author | Travis Howell | 2008-04-30 04:39:58 +0000 |
---|---|---|
committer | Travis Howell | 2008-04-30 04:39:58 +0000 |
commit | acc232718fba57c8a2e3ae8238e42daa1739525b (patch) | |
tree | 56c236bdf84e8a549d3e91cd95b1010a39e753e8 /engines/scumm | |
parent | bad36eaa614c0e60ba501e0207c607a0e54756c0 (diff) | |
download | scummvm-rg350-acc232718fba57c8a2e3ae8238e42daa1739525b.tar.gz scummvm-rg350-acc232718fba57c8a2e3ae8238e42daa1739525b.tar.bz2 scummvm-rg350-acc232718fba57c8a2e3ae8238e42daa1739525b.zip |
Revert string clipping changes, as they only applied to The Dig (Second release) and COMI.
svn-id: r31785
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/string.cpp | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp index dfaf0dc6e6..e31c3ed9c9 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; |