diff options
author | Torbjörn Andersson | 2005-04-26 06:34:52 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-04-26 06:34:52 +0000 |
commit | 5d392d90d6219c811aac32848fc14a5ea76a848c (patch) | |
tree | 7c9c5712ea6ffe2f487dc99ef53fa947dd59acb1 | |
parent | 74ae914df2b88bcb28e0fec40e9e69ed3915af41 (diff) | |
download | scummvm-rg350-5d392d90d6219c811aac32848fc14a5ea76a848c.tar.gz scummvm-rg350-5d392d90d6219c811aac32848fc14a5ea76a848c.tar.bz2 scummvm-rg350-5d392d90d6219c811aac32848fc14a5ea76a848c.zip |
We need to use unsigned chars here to be able to print accented characters,
e.g. in the German cutscenes.
svn-id: r17805
-rw-r--r-- | gob/driver_vga.cpp | 2 | ||||
-rw-r--r-- | gob/driver_vga.h | 2 | ||||
-rw-r--r-- | gob/video.cpp | 2 | ||||
-rw-r--r-- | gob/video.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gob/driver_vga.cpp b/gob/driver_vga.cpp index 30eb8f2dad..dddc7e2cb6 100644 --- a/gob/driver_vga.cpp +++ b/gob/driver_vga.cpp @@ -73,7 +73,7 @@ void VGAVideoDriver::putPixel(int16 x, int16 y, byte color, SurfaceDesc *dest) { dest->vidPtr[(y * dest->width) + x] = color; } -void VGAVideoDriver::drawLetter(char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest) { +void VGAVideoDriver::drawLetter(unsigned char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest) { byte *src, *dst; uint16 data; int i, j; diff --git a/gob/driver_vga.h b/gob/driver_vga.h index b2dbef52f9..13be635e9a 100644 --- a/gob/driver_vga.h +++ b/gob/driver_vga.h @@ -33,7 +33,7 @@ public: void drawSprite(SurfaceDesc *source, SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp); void fillRect(SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, byte color); void putPixel(int16 x, int16 y, byte color, SurfaceDesc *dest); - void drawLetter(char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest); + void drawLetter(unsigned char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest); void drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1, int16 y1, byte color); void drawPackedSprite(byte *sprBuf, int16 width, int16 height, int16 x, int16 y, byte transp, SurfaceDesc *dest); }; diff --git a/gob/video.cpp b/gob/video.cpp index 60cff590ef..aa4d502183 100644 --- a/gob/video.cpp +++ b/gob/video.cpp @@ -289,7 +289,7 @@ void vid_putPixel(int16 x, int16 y, int16 color, SurfaceDesc *dest) { _videoDriver->putPixel(x, y, color, dest); } -void vid_drawLetter(char item, int16 x, int16 y, FontDesc *fontDesc, int16 color1, +void vid_drawLetter(unsigned char item, int16 x, int16 y, FontDesc *fontDesc, int16 color1, int16 color2, int16 transp, SurfaceDesc * dest) { // pDrawLetter(item, x, y, fontDesc, color1, color2, transp, dest); diff --git a/gob/video.h b/gob/video.h index 4130903aa9..1ab0bb5a85 100644 --- a/gob/video.h +++ b/gob/video.h @@ -65,7 +65,7 @@ public: virtual void drawSprite(SurfaceDesc *source, SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, int16 x, int16 y, int16 transp) = 0; virtual void fillRect(SurfaceDesc *dest, int16 left, int16 top, int16 right, int16 bottom, byte color) = 0; virtual void putPixel(int16 x, int16 y, byte color, SurfaceDesc *dest) = 0; - virtual void drawLetter(char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest) = 0; + virtual void drawLetter(unsigned char item, int16 x, int16 y, FontDesc *fontDesc, byte color1, byte color2, byte transp, SurfaceDesc *dest) = 0; virtual void drawLine(SurfaceDesc *dest, int16 x0, int16 y0, int16 x1, int16 y1, byte color) = 0; virtual void drawPackedSprite(byte *sprBuf, int16 width, int16 height, int16 x, int16 y, byte transp, SurfaceDesc *dest) = 0; }; @@ -120,7 +120,7 @@ void vid_fillRect(SurfaceDesc * dest, int16 left, int16 top, int16 right, int16 void vid_drawLine(SurfaceDesc * dest, int16 x0, int16 y0, int16 x1, int16 y1, int16 color); void vid_putPixel(int16 x, int16 y, int16 color, SurfaceDesc * dest); -void vid_drawLetter(char item, int16 x, int16 y, FontDesc * fontDesc, int16 color1, +void vid_drawLetter(unsigned char item, int16 x, int16 y, FontDesc * fontDesc, int16 color1, int16 color2, int16 transp, SurfaceDesc * dest); void vid_clearSurf(SurfaceDesc * dest); void vid_drawPackedSprite(byte *sprBuf, int16 width, int16 height, int16 x, int16 y, |