CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <[EMAIL PROTECTED]> 04/08/28 13:51:39
Modified files:
data/translations: english.cfg
src : language.cpp
Log message:
declare the font in english.cfg, and have it set after filling
string_table
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/translations/english.cfg.diff?tr1=1.157&tr2=1.158&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
Patches:
Index: wesnoth/data/translations/english.cfg
diff -u wesnoth/data/translations/english.cfg:1.157
wesnoth/data/translations/english.cfg:1.158
--- wesnoth/data/translations/english.cfg:1.157 Tue Aug 24 19:24:46 2004
+++ wesnoth/data/translations/english.cfg Sat Aug 28 13:51:39 2004
@@ -1,6 +1,7 @@
[language]
id=en
language="English"
+font=_"Vera.ttf"
EASY= _ "Easy"
NORMAL= _ "Medium"
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.35 wesnoth/src/language.cpp:1.36
--- wesnoth/src/language.cpp:1.35 Sun Aug 22 01:30:07 2004
+++ wesnoth/src/language.cpp Sat Aug 28 13:51:39 2004
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.35 2004/08/22 01:30:07 Sirp Exp $ */
+/* $Id: language.cpp,v 1.36 2004/08/28 13:51:39 ydirson Exp $ */
/*
Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -115,8 +115,6 @@
setlocale (LC_MESSAGES, locale.localename.c_str());
- font::set_font((**i)["font"]);
-
return true;
}
}
@@ -155,6 +153,9 @@
}
// end of string_table fill
+ // ENGLISH-CFG
+ font::set_font(string_table["font"]);
+
return true;
}
