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

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/12/16 01:03:29

Modified files:
        src            : theme.cpp 

Log message:
        minor cleanups

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

Patches:
Index: wesnoth/src/theme.cpp
diff -u wesnoth/src/theme.cpp:1.26 wesnoth/src/theme.cpp:1.27
--- wesnoth/src/theme.cpp:1.26  Sat Dec 11 22:40:46 2004
+++ wesnoth/src/theme.cpp       Thu Dec 16 01:03:29 2004
@@ -146,6 +146,8 @@
                        outcfg = new config(*origcfg);
                }
 
+               // FIXME: we should ignore any id attribute from inherited 
[resolution]
+
                // override attributes
                for(string_map::const_iterator j = cfg.values.begin(); j != 
cfg.values.end(); ++j) {
                        outcfg->values[j->first] = j->second;
@@ -156,7 +158,8 @@
                        const config::child_list& c = 
cfg.get_children("remove");
                        for(config::child_list::const_iterator i = c.begin(); i 
!= c.end(); ++i) {
                                const config* parent;
-                               config& target = find_ref ((**i)["id"], 
*outcfg, true);
+                               find_ref ((**i)["id"], *outcfg,
+                                         true /* remove found child*/);
                        }
                }
                {
@@ -184,7 +187,6 @@
                        if (*value.first == "partialresolution") {
                                childname = new std::string("resolution");
                                sourceconfig = expand_partialresolution 
(*sourceconfig, topcfg);
-                               //std::cerr << sourceconfig->write();
                        }
                        config& childcfg = 
resolved_config.add_child(*childname);
                        do_resolve_rects(*sourceconfig, childcfg, topcfg,
@@ -226,6 +228,7 @@
                config* newcfg = new config();
 
                do_resolve_rects(cfg, *newcfg, cfg);
+               //std::cerr << newcfg->write();
 
                return *newcfg;
        }