upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 09:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/wesnoth/wesnoth

Browse Source
This commit is contained in:
Chris Beck 2014-05-20 01:16:00 -04:00
commit c211bc4b7e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/team.cpp
View File

@ -72,9 +72,9 @@ const std::vector<team>& teams_manager::get_teams()
team::DEFEAT_CONDITION team::parse_defeat_condition(const std::string& cond, team::DEFEAT_CONDITION def)
{
if(cond == "no_leader")
if(cond == "no_leader_left")
return team::NO_LEADER;
else if (cond == "no_unit")
else if (cond == "no_units_left")
return team::NO_UNITS;
else if (cond == "never")
return team::NEVER;
@ -89,9 +89,9 @@ std::string team::defeat_condition_to_string(DEFEAT_CONDITION cond)
switch(cond)
{
case team::NO_LEADER:
return "no_leader";
return "no_leader_left";
case team::NO_UNITS:
return "no_unit";
return "no_units_left";
case team::NEVER:
return "never";
case team::ALWAYS: