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

[Isaac Clerencia]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        04/08/26 15:50:01

Modified files:
        src            : team.cpp 

Log message:
        Set colour to side if colour not specified to avoid breaking flags in
        ALL scenarios, saved games, ...

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

Patches:
Index: wesnoth/src/team.cpp
diff -u wesnoth/src/team.cpp:1.68 wesnoth/src/team.cpp:1.69
--- wesnoth/src/team.cpp:1.68   Sat Aug 21 22:21:05 2004
+++ wesnoth/src/team.cpp        Thu Aug 26 15:50:01 2004
@@ -1,4 +1,4 @@
-/* $Id: team.cpp,v 1.68 2004/08/21 22:21:05 Sirp Exp $ */
+/* $Id: team.cpp,v 1.69 2004/08/26 15:50:01 isaaccp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -65,6 +65,11 @@
        team_name = cfg["team_name"];
        if(team_name.empty())
                team_name = cfg["side"];
+       const std::string& side_colour = cfg["colour"];
+       colour = lexical_cast_default<int>(cfg["colour"],-1);
+       if(colour == -1)
+               colour = lexical_cast_default<int>(cfg["side"],-1);
+
        flag = cfg["flag"];
 
        description = cfg["description"];
@@ -172,8 +177,6 @@
        std::cerr << ", share_maps: " << share_maps << ", share_view: " << 
share_view << ".\n";
        
        music = cfg["music"];
-
-       colour = lexical_cast_default<int>(cfg["colour"],-1);
 }
 
 void team::team_info::write(config& cfg) const