[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.26,1.27 newgui.h,1.15,1.16

Max Horn fingolfin at users.sourceforge.net
Tue Nov 5 13:49:09 CET 2002


Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv9048/gui

Modified Files:
	newgui.cpp newgui.h 
Log Message:
fix for bug #633087 (umlauts in GUI)

Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- newgui.cpp	5 Nov 2002 13:33:33 -0000	1.26
+++ newgui.cpp	5 Nov 2002 21:48:40 -0000	1.27
@@ -390,7 +390,7 @@
 	_system->copy_rect_overlay(buf, _screenPitch, x, y, w, h);
 }
 
-void NewGui::drawChar(const char chr, int xx, int yy, int16 color)
+void NewGui::drawChar(const byte chr, int xx, int yy, int16 color)
 {
 	unsigned int buffer = 0, mask = 0, x, y;
 	byte *tmp;
@@ -425,7 +425,7 @@
 	return space;
 }
 
-int NewGui::getCharWidth(char c)
+int NewGui::getCharWidth(byte c)
 {
 	return guifont[c+6];
 }

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- newgui.h	19 Oct 2002 01:22:41 -0000	1.15
+++ newgui.h	5 Nov 2002 21:48:40 -0000	1.16
@@ -126,9 +126,9 @@
 	void checkerRect(int x, int y, int w, int h, int16 color);
 	void frameRect(int x, int y, int w, int h, int16 color);
 	void addDirtyRect(int x, int y, int w, int h);
-	void drawChar(char c, int x, int y, int16 color);
+	void drawChar(byte c, int x, int y, int16 color);
 	int getStringWidth(const String &str);
-	int getCharWidth(char c);
+	int getCharWidth(byte c);
 	void drawString(const String &str, int x, int y, int w, int16 color, int align = kTextAlignLeft);
 
 	void drawBitmap(uint32 bitmap[8], int x, int y, int16 color);





More information about the Scummvm-git-logs mailing list