libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-03 07:59:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: Improvement of 'printchar' signature

Browse Source
This commit is contained in:
Bertrand Augereau 2011-08-10 16:54:23 +02:00
parent 4ad8b54241
commit edbec1cccb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/dreamweb/print.cpp
View File

@ -35,7 +35,7 @@ void DreamGenContext::printboth() {
void DreamGenContext::printboth(uint16 src, uint16 *x, uint16 y, uint8 c, uint8 nextChar) { void DreamGenContext::printboth(uint16 src, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
uint16 newX = *x; uint16 newX = *x;
uint8 width, height; uint8 width, height;
printchar(src, &newX, y, c, nextChar, &width, &height); printchar(segRef(src).ptr(0, 0), &newX, y, c, nextChar, &width, &height);
multidump(*x, y, width, height); multidump(*x, y, width, height);
*x = newX; *x = newX;
} }
@ -76,13 +76,13 @@ void DreamGenContext::getnextword() {
void DreamGenContext::printchar() { void DreamGenContext::printchar() {
uint16 x = di; uint16 x = di;
uint8 width, height; uint8 width, height;
printchar(ds, &x, bx, al, ah, &width, &height); printchar(ds.ptr(0, 0), &x, bx, al, ah, &width, &height);
di = x; di = x;
cl = width; cl = width;
ch = height; ch = height;
} }
void DreamGenContext::printchar(uint16 src, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) { void DreamGenContext::printchar(const void *src, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
if (c == 255) if (c == 255)
return; return;
push(si); push(si);
@ -90,8 +90,7 @@ void DreamGenContext::printchar(uint16 src, uint16* x, uint16 y, uint8 c, uint8
if (data.byte(kForeignrelease) != 0) if (data.byte(kForeignrelease) != 0)
y -= 3; y -= 3;
uint16 tmp = c - 32 + data.word(kCharshift); uint16 tmp = c - 32 + data.word(kCharshift);
ds = src; showframe(src, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
showframe(ds.ptr(0, 0), *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
di = pop(); di = pop();
si = pop(); si = pop();
_cmp(data.byte(kKerning), 0); _cmp(data.byte(kKerning), 0);
@ -169,6 +168,7 @@ void DreamGenContext::printdirect() {
void DreamGenContext::printdirect(uint16 x, uint16 *y, uint8 maxWidth, bool centered) { void DreamGenContext::printdirect(uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
data.word(kLastxpos) = x; data.word(kLastxpos) = x;
ds = data.word(kCurrentset); ds = data.word(kCurrentset);
const void *src = ds.ptr(0, 0);
while (true) { while (true) {
uint16 offset = x; uint16 offset = x;
uint8 charCount = getnumber(si, maxWidth, centered, &offset); uint8 charCount = getnumber(si, maxWidth, centered, &offset);
@ -182,7 +182,7 @@ void DreamGenContext::printdirect(uint16 x, uint16 *y, uint8 maxWidth, bool cent
} }
c = engine->modifyChar(c); c = engine->modifyChar(c);
uint8 width, height; uint8 width, height;
printchar(ds, &i, *y, c, nextChar, &width, &height); printchar(src, &i, *y, c, nextChar, &width, &height);
data.word(kLastxpos) = i; data.word(kLastxpos) = i;
--charCount; --charCount;
} while(charCount); } while(charCount);

2
engines/dreamweb/stubs.h
View File

@ -46,7 +46,7 @@
void printboth(); void printboth();
void printboth(uint16 src, uint16 *x, uint16 y, uint8 c, uint8 nextChar); void printboth(uint16 src, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
void printchar(); void printchar();
void printchar(uint16 src, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height); void printchar(const void *src, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
void printdirect(); void printdirect();
void printdirect(uint16 x, uint16 *y, uint8 maxWidth, bool centered); void printdirect(uint16 x, uint16 *y, uint8 maxWidth, bool centered);
void usetimedtext(); void usetimedtext();