[Wesnoth-cvs-commits] wesnoth/src filesystem.cpp language.cpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/06/24 22:41:49

Modified files:
        src            : filesystem.cpp language.cpp 

Log message:
        fix to make translations for user campaigns work in Windows

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.73&tr2=1.74&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/language.cpp.diff?tr1=1.95&tr2=1.96&r1=text&r2=text

Patches:
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.73 wesnoth/src/filesystem.cpp:1.74
--- wesnoth/src/filesystem.cpp:1.73     Sat Jun  4 19:16:05 2005
+++ wesnoth/src/filesystem.cpp  Fri Jun 24 22:41:49 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.73 2005/06/04 19:16:05 ott Exp $ */
+/* $Id: filesystem.cpp,v 1.74 2005/06/24 22:41:49 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -759,7 +759,7 @@
        const std::vector<std::string>& paths = get_binary_paths(type);
        for(std::vector<std::string>::const_iterator i = paths.begin(); i != 
paths.end(); ++i) {
                const std::string file = *i + filename;
-               if(file_exists(file)) {
+               if(file_exists(file) || is_directory(file)) {
                        return file;
                }
        }
Index: wesnoth/src/language.cpp
diff -u wesnoth/src/language.cpp:1.95 wesnoth/src/language.cpp:1.96
--- wesnoth/src/language.cpp:1.95       Wed Jun 22 12:11:26 2005
+++ wesnoth/src/language.cpp    Fri Jun 24 22:41:49 2005
@@ -1,4 +1,4 @@
-/* $Id: language.cpp,v 1.95 2005/06/22 12:11:26 ott Exp $ */
+/* $Id: language.cpp,v 1.96 2005/06/24 22:41:49 Sirp Exp $ */
 /* vim:set encoding=utf-8: */
 /*
    Copyright (C) 2003 by David White <address@hidden>
@@ -251,7 +251,7 @@
                if(path.empty()) {
                        t_string::add_textdomain(name, get_intl_dir());
                } else {
-                       const std::string& location = 
get_binary_file_location(path, ".");
+                       const std::string& location = 
get_binary_file_location(path, "");
 
                        //if location is empty, this causes a crash on Windows, 
so we
                        //disallow adding empty domains