[Scummvm-cvs-logs] scummvm master -> 90ecc195c1939a073d27c56fe27678764979650b
wjp
wjp at usecode.org
Sat Nov 19 19:18:00 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
90ecc195c1 DREAMWEB: Clean up loop
Commit: 90ecc195c1939a073d27c56fe27678764979650b
https://github.com/scummvm/scummvm/commit/90ecc195c1939a073d27c56fe27678764979650b
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-11-19T10:17:04-08:00
Commit Message:
DREAMWEB: Clean up loop
Changed paths:
engines/dreamweb/print.cpp
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index f12d8ee..3e305dc 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -246,18 +246,23 @@ const char *DreamGenContext::monprint(const char *string) {
uint16 x = data.word(kMonadx);
Frame *tempCharset = (Frame *)segRef(data.word(kTempcharset)).ptr(0, 0);
const char *iterator = string;
- while (true) {
+ bool done = false;
+ while (!done) {
+
uint16 count = getnumber(tempCharset, (const uint8 *)iterator, 166, false, &x);
- do {
+ do {
char c = *iterator++;
if (c == ':')
break;
- if ((c == 0) || (c == 34) || (c == '='))
- goto finishmon;
+ if ((c == 0) || (c == '"') || (c == '=')) {
+ done = true;
+ break;
+ }
if (c == '%') {
data.byte(kLasttrigger) = *iterator;
iterator += 2;
- goto finishmon;
+ done = true;
+ break;
}
c = engine->modifyChar(c);
printchar(tempCharset, &x, data.word(kMonady), c, 0, NULL, NULL);
@@ -268,16 +273,13 @@ const char *DreamGenContext::monprint(const char *string) {
vsync();
lockmon();
delcurs();
- --count;
- }
- while(count);
+ } while (--count);
+
x = data.word(kMonadx);
scrollmonitor();
data.word(kCurslocx) = data.word(kMonadx);
}
-finishmon:
- data.word(kCurslocx) = data.word(kMonadx);
- scrollmonitor();
+
data.byte(kKerning) = 0;
return iterator;
}
More information about the Scummvm-git-logs
mailing list