diff options
| author | Willem Jan Palenstijn | 2011-12-04 14:17:39 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-12-04 20:48:10 +0100 |
| commit | 5871a6943fa0a07bae81482ed96448cd3763af08 (patch) | |
| tree | 1f4a13e965e31ca77d2e82621a3ddacfbc912bd4 | |
| parent | f154ff626bfab1493e7af19f58e650f10f28eff2 (diff) | |
| download | scummvm-rg350-5871a6943fa0a07bae81482ed96448cd3763af08.tar.gz scummvm-rg350-5871a6943fa0a07bae81482ed96448cd3763af08.tar.bz2 scummvm-rg350-5871a6943fa0a07bae81482ed96448cd3763af08.zip | |
DREAMWEB: Cleanup
| -rw-r--r-- | engines/dreamweb/print.cpp | 27 | ||||
| -rw-r--r-- | engines/dreamweb/stubs.h | 1 |
2 files changed, 10 insertions, 18 deletions
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp index dce5fc76be..528b897b60 100644 --- a/engines/dreamweb/print.cpp +++ b/engines/dreamweb/print.cpp @@ -171,12 +171,6 @@ uint8 DreamGenContext::printDirect(const uint8** string, uint16 x, uint16 *y, ui } } -void DreamGenContext::getNumber() { - uint16 offset = di; - cl = getNumber((Frame *)ds.ptr(0, 0), es.ptr(si, 0), dl, (bool)(dl & 1), &offset); - di = offset; -} - uint8 DreamGenContext::getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) { uint8 totalWidth = 0; uint8 charCount = 0; @@ -185,31 +179,30 @@ uint8 DreamGenContext::getNumber(const Frame *charSet, const uint8 *string, uint uint8 done = getNextWord(charSet, string, &wordTotalWidth, &wordCharCount); string += wordCharCount; + uint16 tmp = totalWidth + wordTotalWidth - 10; if (done == 1) { //endoftext - ax = totalWidth + wordTotalWidth - 10; - if (ax < maxWidth) { + if (tmp < maxWidth) { totalWidth += wordTotalWidth; charCount += wordCharCount; } if (centered) { - ax = (maxWidth & 0xfe) + 2 + 20 - totalWidth; - ax /= 2; + tmp = (maxWidth & 0xfe) + 2 + 20 - totalWidth; + tmp /= 2; } else { - ax = 0; + tmp = 0; } *offset += ax; return charCount; } - ax = totalWidth + wordTotalWidth - 10; - if (ax >= maxWidth) { //gotoverend + if (tmp >= maxWidth) { //gotoverend if (centered) { - ax = (maxWidth & 0xfe) - totalWidth + 20; - ax /= 2; + tmp = (maxWidth & 0xfe) - totalWidth + 20; + tmp /= 2; } else { - ax = 0; + tmp = 0; } - *offset += ax; + *offset += tmp; return charCount; } totalWidth += wordTotalWidth; diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h index 082a94cd6e..8f4d643cd3 100644 --- a/engines/dreamweb/stubs.h +++ b/engines/dreamweb/stubs.h @@ -88,7 +88,6 @@ uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered); void printSlow(); void dumpTextLine(); - void getNumber(); uint8 getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset); uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width); void oldToNames(); |