[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.144,1.145 dialogs.h,1.54,1.55
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_43.png,NONE,1.1 big_scummvm_44.png,NONE,1.1 big_scummvm_45.png,NONE,1.1 big_scummvm_46.png,NONE,1.1 big_scummvm_47.png,NONE,1.1 big_scummvm_48.png,NONE,1.1 big_scummvm_49.png,NONE,1.1 big_scummvm_50.png,NONE,1.1 big_scummvm_51.png,NONE,1.1 scummvm_43.png,NONE,1.1 scummvm_43.txt,NONE,1.1 scummvm_44.png,NONE,1.1 scummvm_44.txt,NONE,1.1 scummvm_45.png,NONE,1.1 scummvm_45.txt,NONE,1.1 scummvm_46.png,NONE,1.1 scummvm_46.txt,NONE,1.1 scummvm_47.png,NONE,1.1 scummvm_47.txt,NONE,1.1 scummvm_48.png,NONE,1.1 scummvm_48.txt,NONE,1.1 scummvm_49.png,NONE,1.1 scummvm_49.txt,NONE,1.1 scummvm_50.png,NONE,1.1 scummvm_50.txt,NONE,1.1 scummvm_51.png,NONE,1.1 scummvm_51.txt,NONE,1.1 big_scummvm_38.png,1.1,1.2 big_scummvm_40.png,1.2,1.3 big_scummvm_42.png,1.1,1.2 scummvm_38.png,1.1,1.2 scummvm_40.png,1.2,1.3 scummvm_41.txt,1.1,1.2 scummvm_42.png,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.144,1.145 dialogs.h,1.54,1.55
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_43.png,NONE,1.1 big_scummvm_44.png,NONE,1.1 big_scummvm_45.png,NONE,1.1 big_scummvm_46.png,NONE,1.1 big_scummvm_47.png,NONE,1.1 big_scummvm_48.png,NONE,1.1 big_scummvm_49.png,NONE,1.1 big_scummvm_50.png,NONE,1.1 big_scummvm_51.png,NONE,1.1 scummvm_43.png,NONE,1.1 scummvm_43.txt,NONE,1.1 scummvm_44.png,NONE,1.1 scummvm_44.txt,NONE,1.1 scummvm_45.png,NONE,1.1 scummvm_45.txt,NONE,1.1 scummvm_46.png,NONE,1.1 scummvm_46.txt,NONE,1.1 scummvm_47.png,NONE,1.1 scummvm_47.txt,NONE,1.1 scummvm_48.png,NONE,1.1 scummvm_48.txt,NONE,1.1 scummvm_49.png,NONE,1.1 scummvm_49.txt,NONE,1.1 scummvm_50.png,NONE,1.1 scummvm_50.txt,NONE,1.1 scummvm_51.png,NONE,1.1 scummvm_51.txt,NONE,1.1 big_scummvm_38.png,1.1,1.2 big_scummvm_40.png,1.2,1.3 big_scummvm_42.png,1.1,1.2 scummvm_38.png,1.1,1.2 scummvm_40.png,1.2,1.3 scummvm_41.txt,1.1,1.2 scummvm_42.png,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list