CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <[EMAIL PROTECTED]> 04/08/29 14:58:40
Modified files:
src : font.cpp font.hpp
Log message:
drop the font from english.cfg, fill it directly from font.cpp. also
drop useless strings
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.hpp.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.82 wesnoth/src/font.cpp:1.83
--- wesnoth/src/font.cpp:1.82 Thu Aug 26 20:56:03 2004
+++ wesnoth/src/font.cpp Sun Aug 29 14:58:40 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.82 2004/08/26 20:56:03 ettin Exp $ */
+/* $Id: font.cpp,v 1.83 2004/08/29 14:58:40 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -155,13 +155,10 @@
TTF_Quit();
}
-void set_font(const std::string& name)
+void set_font()
{
clear_fonts();
- font_name = name;
- if(font_name == "") {
- font_name = "Vera.ttf";
- }
+ font_name = _("Vera.ttf");
}
const SDL_Color NORMAL_COLOUR = {0xDD,0xDD,0xDD,0},
Index: wesnoth/src/font.hpp
diff -u wesnoth/src/font.hpp:1.38 wesnoth/src/font.hpp:1.39
--- wesnoth/src/font.hpp:1.38 Thu Aug 26 20:56:03 2004
+++ wesnoth/src/font.hpp Sun Aug 29 14:58:40 2004
@@ -1,4 +1,4 @@
-/* $Id: font.hpp,v 1.38 2004/08/26 20:56:03 ettin Exp $ */
+/* $Id: font.hpp,v 1.39 2004/08/29 14:58:40 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -31,7 +31,7 @@
};
//function which sets the name of the font to use
-void set_font(const std::string& name);
+void set_font();
//various standard colours
extern const SDL_Color NORMAL_COLOUR, GOOD_COLOUR, BAD_COLOUR, BLACK_COLOUR,
