libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-27 04:07:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: Cleanup in 'getNumber'

Browse Source
This commit is contained in:
Bertrand Augereau 2011-12-05 00:37:19 +01:00
parent 65b2bfe8a1
commit 3d4aa7ea32
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/dreamweb/print.cpp
View File

@ -179,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;
*offset += tmp;
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;