[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src font.cpp
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src font.cpp |
Date: |
Tue, 09 Aug 2005 17:43:20 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/08/09 21:43:20
Modified files:
src : font.cpp
Log message:
now it should work I have forgotten set_font_list
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.150&tr2=1.151&r1=text&r2=text
Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.150 wesnoth/src/font.cpp:1.151
--- wesnoth/src/font.cpp:1.150 Tue Aug 9 21:27:52 2005
+++ wesnoth/src/font.cpp Tue Aug 9 21:43:20 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.150 2005/08/09 21:27:52 j_daniel Exp $ */
+/* $Id: font.cpp,v 1.151 2005/08/09 21:43:20 j_daniel Exp $ */
/* vim:set encoding=utf-8: */
/*
Copyright (C) 2003 by David White <address@hidden>
@@ -280,8 +280,12 @@
// Insert fonts only if the font file exists
if(game_config::path.empty() == false) {
if(!file_exists(game_config::path + "/fonts/" +
itor->name)) {
- WRN_FT << "Failed opening font file '" <<
itor->name << "': No such file or directory\n";
- continue;
+ if(!file_exists("fonts/" + itor->name)) {
+ if(!file_exists(itor->name)) {
+ WRN_FT << "Failed opening font file '"
<< itor->name << "': No such file or directory\n";
+ continue;
+ }
+ }
}
} else {
if(!file_exists("fonts/" + itor->name)) {