[Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.115,1.116 newgui.h,1.60,1.61

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Jun 3 06:10:28 CEST 2005


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

Modified Files:
	newgui.cpp newgui.h 
Log Message:
The alternative form of drawString() is no longer needed.


Index: newgui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- newgui.cpp	2 Jun 2005 12:29:01 -0000	1.115
+++ newgui.cpp	3 Jun 2005 13:09:23 -0000	1.116
@@ -455,10 +455,6 @@
 	getFont().drawString(&_screen, s, x, y, w, color, align, deltax, useEllipsis);
 }
 
-void NewGui::drawString(const Graphics::Font *font, const String &s, int x, int y, int w, OverlayColor color, TextAlignment align, int deltax, bool useEllipsis) {
-	font->drawString(&_screen, s, x, y, w, color, align, deltax, useEllipsis);
-}
-
 //
 // Draw the mouse cursor (animated). This is mostly ripped from the cursor code in gfx.cpp
 // We could plug in a different cursor here if we like to.

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- newgui.h	2 Jun 2005 12:29:01 -0000	1.60
+++ newgui.h	3 Jun 2005 13:09:24 -0000	1.61
@@ -151,7 +151,6 @@
 
 	void drawChar(byte c, int x, int y, OverlayColor color, const Graphics::Font *font = 0);
 	void drawString(const String &str, int x, int y, int w, OverlayColor color, Graphics::TextAlignment align = Graphics::kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
-	void drawString(const Graphics::Font *font, const String &str, int x, int y, int w, OverlayColor color, Graphics::TextAlignment align = Graphics::kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
 
 	int getStringWidth(const String &str) const;
 	int getCharWidth(byte c) const;





More information about the Scummvm-git-logs mailing list