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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/03/24 08:26:45

Modified files:
        src            : game_events.cpp 

Log message:
        Enforce const-dependent behavior (bad bad bad). Should fix the issue 
with variable interpolation in option boxes.

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

Patches:
Index: wesnoth/src/game_events.cpp
diff -u wesnoth/src/game_events.cpp:1.135 wesnoth/src/game_events.cpp:1.136
--- wesnoth/src/game_events.cpp:1.135   Wed Mar 23 22:42:28 2005
+++ wesnoth/src/game_events.cpp Thu Mar 24 08:26:45 2005
@@ -1,4 +1,4 @@
-/* $Id: game_events.cpp,v 1.135 2005/03/23 22:42:28 j_daniel Exp $ */
+/* $Id: game_events.cpp,v 1.136 2005/03/24 08:26:45 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1100,9 +1100,9 @@
                const config::child_list& menu_items = 
cfg.get_children("option");
                for(config::child_list::const_iterator mi = menu_items.begin();
                    mi != menu_items.end(); ++mi) {
-                       const std::string& msg = (**mi)["message"];
-                       options.push_back(msg);
-                       option_events.push_back((*mi)->child_range("command"));
+                       config const &cfg_mi = **mi;
+                       options.push_back(cfg_mi["message"]);
+                       option_events.push_back(cfg_mi.child_range("command"));
                }
 
                surface surface(NULL);