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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/09/16 12:14:44

Modified files:
        src            : game.cpp filesystem.cpp filesystem.hpp 

Log message:
        fixed bugs where images of campaigns downloaded from campaign server 
wouldn't show until Wesnoth had been restarted

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.277&tr2=1.278&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.cpp.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/filesystem.hpp.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: wesnoth/src/filesystem.cpp
diff -u wesnoth/src/filesystem.cpp:1.79 wesnoth/src/filesystem.cpp:1.80
--- wesnoth/src/filesystem.cpp:1.79     Tue Sep  6 13:53:14 2005
+++ wesnoth/src/filesystem.cpp  Fri Sep 16 12:14:44 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.cpp,v 1.79 2005/09/06 13:53:14 ott Exp $ */
+/* $Id: filesystem.cpp,v 1.80 2005/09/16 12:14:44 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -767,6 +767,11 @@
        for(std::vector<std::string>::const_iterator i = paths_.begin(); i != 
paths_.end(); ++i) {
                binary_paths.erase(*i);
        }
+}
+
+void clear_binary_paths_cache()
+{
+       binary_paths_cache.clear();
 }
 
 const std::vector<std::string>& get_binary_paths(const std::string& type)
Index: wesnoth/src/filesystem.hpp
diff -u wesnoth/src/filesystem.hpp:1.39 wesnoth/src/filesystem.hpp:1.40
--- wesnoth/src/filesystem.hpp:1.39     Sat Aug  6 20:26:54 2005
+++ wesnoth/src/filesystem.hpp  Fri Sep 16 12:14:44 2005
@@ -1,4 +1,4 @@
-/* $Id: filesystem.hpp,v 1.39 2005/08/06 20:26:54 j_daniel Exp $ */
+/* $Id: filesystem.hpp,v 1.40 2005/09/16 12:14:44 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -132,7 +132,8 @@
 
        std::vector<std::string> paths_;
 };
-
+
+void clear_binary_paths_cache();
 
 //function which, given a type of binary, e.g. 'images', 'sounds', etc,
 //will return a vector with all possible paths to that type of binary
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.277 wesnoth/src/game.cpp:1.278
--- wesnoth/src/game.cpp:1.277  Tue Sep  6 13:53:14 2005
+++ wesnoth/src/game.cpp        Fri Sep 16 12:14:44 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.277 2005/09/06 13:53:14 ott Exp $ */
+/* $Id: game.cpp,v 1.278 2005/09/16 12:14:44 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -1015,7 +1015,10 @@
                old_defines_map_.clear();
                refresh_game_cfg();
                use_caching_ = old_cache;
-               ::init_textdomains(game_config_);
+               ::init_textdomains(game_config_);
+               paths_manager_.set_paths(game_config_);
+
+               clear_binary_paths_cache();
 
                gui::show_dialog(disp(),NULL,_("Campaign Installed"),_("The 
campaign has been installed."),gui::OK_ONLY);
        } catch(config::error&) {