diff options
author | Bertrand Augereau | 2011-08-11 02:30:25 +0200 |
---|---|---|
committer | Bertrand Augereau | 2011-08-11 02:30:25 +0200 |
commit | b701deed4f192f29b92fadb50275e2bdb5c39959 (patch) | |
tree | 4dd5aff3698de5ce5ad28d06685a5ce518862612 | |
parent | 3e9773a858b5d710845d7a188dbebbada1101887 (diff) | |
download | scummvm-rg350-b701deed4f192f29b92fadb50275e2bdb5c39959.tar.gz scummvm-rg350-b701deed4f192f29b92fadb50275e2bdb5c39959.tar.bz2 scummvm-rg350-b701deed4f192f29b92fadb50275e2bdb5c39959.zip |
DREAMWEB: Less ds pollution in 'printslow' and 'printdirect'
-rw-r--r-- | engines/dreamweb/print.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp index f8dddf3f4e..9e4c416015 100644 --- a/engines/dreamweb/print.cpp +++ b/engines/dreamweb/print.cpp @@ -106,8 +106,7 @@ void DreamGenContext::printslow() { uint8 DreamGenContext::printslow(uint16 x, uint16 y, uint8 maxWidth, bool centered) { data.byte(kPointerframe) = 1; data.byte(kPointermode) = 3; - ds = data.word(kCharset1); - const Frame* charSet = (const Frame *)ds.ptr(0, 0); + const Frame* charSet = (const Frame *)segRef(data.word(kCharset1)).ptr(0, 0); do { uint16 offset = x; uint16 charCount = getnumber(charSet, es.ptr(si, 0), maxWidth, centered, &offset); @@ -164,8 +163,7 @@ void DreamGenContext::printdirect() { void DreamGenContext::printdirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) { data.word(kLastxpos) = x; - ds = data.word(kCurrentset); - const Frame *charSet = (const Frame *)ds.ptr(0, 0); + const Frame *charSet = (const Frame *)segRef(data.word(kCurrentset)).ptr(0, 0); while (true) { uint16 offset = x; uint8 charCount = getnumber(charSet, *string, maxWidth, centered, &offset); |