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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/03/01 00:07:20

Modified files:
        src            : unit_types.cpp 

Log message:
        fix to prevent duplicate traits

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

Patches:
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.84 wesnoth/src/unit_types.cpp:1.85
--- wesnoth/src/unit_types.cpp:1.84     Mon Feb 28 04:27:54 2005
+++ wesnoth/src/unit_types.cpp  Tue Mar  1 00:07:20 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.84 2005/02/28 04:27:54 Sirp Exp $ */
+/* $Id: unit_types.cpp,v 1.85 2005/03/01 00:07:20 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -591,7 +591,7 @@
 
        //insert any traits that are just for this unit type
        const config::child_list& unit_traits = cfg.get_children("trait");
-       
possibleTraits_.insert(possibleTraits_.end(),traits.begin(),traits.end());
+       
possibleTraits_.insert(possibleTraits_.end(),unit_traits.begin(),unit_traits.end());
 
        abilities_ = utils::split(cfg_["ability"]);