[Wesnoth-cvs-commits] wesnoth/src font.cpp

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/08/09 21:27:52

Modified files:
        src            : font.cpp 

Log message:
        Fix font init for BeOS

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.149&tr2=1.150&r1=text&r2=text

Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.149 wesnoth/src/font.cpp:1.150
--- wesnoth/src/font.cpp:1.149  Mon Aug  8 11:54:36 2005
+++ wesnoth/src/font.cpp        Tue Aug  9 21:27:52 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.149 2005/08/08 11:54:36 j_daniel Exp $ */
+/* $Id: font.cpp,v 1.150 2005/08/09 21:27:52 j_daniel Exp $ */
 /* vim:set encoding=utf-8: */
 /*
    Copyright (C) 2003 by David White <address@hidden>
@@ -144,9 +144,16 @@
        if(!game_config::path.empty()) {
                name = game_config::path + "/fonts/" + fname;
                if(!file_exists(name)) {
-                       ERR_FT << "Failed opening font: '" << name << "': No 
such file or directory\n";
-                       return NULL;
+                       name = "fonts/" + fname;
+                       if(!file_exists(name)) {
+                               name = fname;
+                               if(!file_exists(name)) {
+                                       ERR_FT << "Failed opening font: '" << 
name << "': No such file or directory\n";
+                                       return NULL;
+                               }
+                       }
                }
+               
        } else {
                name = "fonts/" + fname;
                if(!file_exists(name)) {