aboutsummaryrefslogtreecommitdiff
path: root/scumm/string.cpp
diff options
context:
space:
mode:
authorMax Horn2003-01-16 00:40:19 +0000
committerMax Horn2003-01-16 00:40:19 +0000
commit8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f (patch)
treef79236ce3ab9645e506eb5b37a914f81d200b654 /scumm/string.cpp
parentec006a4357a7aec841164ed1207f38cd03f540b1 (diff)
downloadscummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.tar.gz
scummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.tar.bz2
scummvm-rg350-8ad002b3a3f7d45d6056729c94b5fd4acdc24a9f.zip
first blastText version. this is work in progress (note that e.g. text is not clipped, and the extra information is not removed)
svn-id: r6472
Diffstat (limited to 'scumm/string.cpp')
-rw-r--r--scumm/string.cpp20
1 files changed, 6 insertions, 14 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 2ac56d03eb..a044ecf0e7 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -374,19 +374,15 @@ void Scumm::description()
do {
c = *buf++;
- if (c == 0) {
- _haveMsg = 1;
- break;
- }
- if (c != 0xFF) {
+ if (c != 0 && c != 0xFF) {
_charset->_left = _charset->_nextLeft;
_charset->_top = _charset->_nextTop;
_charset->printChar(c);
_charset->_nextLeft = _charset->_left;
_charset->_nextTop = _charset->_top;
- continue;
}
- } while (1);
+ } while (c);
+ _haveMsg = 1;
gdi._mask_left = _charset->_strLeft;
gdi._mask_right = _charset->_strRight;
@@ -423,19 +419,15 @@ void Scumm::drawDescString(byte *msg)
do {
c = *buf++;
- if (c == 0) {
- _haveMsg = 1;
- break;
- }
- if (c != 0xFF) {
+ if (c != 0 && c != 0xFF) {
_charset->_left = _charset->_nextLeft;
_charset->_top = _charset->_nextTop;
_charset->printChar(c);
_charset->_nextLeft = _charset->_left;
_charset->_nextTop = _charset->_top;
- continue;
}
- } while (1);
+ } while (c);
+ _haveMsg = 1;
gdi._mask_left = _charset->_strLeft;
gdi._mask_right = _charset->_strRight;