[Scummvm-cvs-logs] CVS: scummvm/gob driver_vga.cpp,1.7,1.8 driver_vga.h,1.4,1.5 video.cpp,1.9,1.10 video.h,1.3,1.4

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5579

Modified Files:
	driver_vga.cpp driver_vga.h video.cpp video.h 
Log Message:
We need to use unsigned chars here to be able to print accented characters,
e.g. in the German cutscenes.


Index: driver_vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/driver_vga.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- driver_vga.cpp	11 Apr 2005 21:44:08 -0000	1.7
+++ driver_vga.cpp	26 Apr 2005 06:34:52 -0000	1.8
@@ -73,7 +73,7 @@
 		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;

Index: driver_vga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/driver_vga.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- driver_vga.h	9 Apr 2005 19:19:53 -0000	1.4
+++ driver_vga.h	26 Apr 2005 06:34:52 -0000	1.5
@@ -33,7 +33,7 @@
         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);
 };

Index: video.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- video.cpp	19 Apr 2005 08:29:43 -0000	1.9
+++ video.cpp	26 Apr 2005 06:34:52 -0000	1.10
@@ -289,7 +289,7 @@
 	_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);

Index: video.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- video.h	9 Apr 2005 19:19:54 -0000	1.3
+++ video.h	26 Apr 2005 06:34:52 -0000	1.4
@@ -65,7 +65,7 @@
 	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_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,