0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make ~TC robust as ~RC:

Browse source 
remove the spaces in parameters because some people use ~TC(1, magenta) 

We also generally need robust image-paths modifications
because any add-on can (badly) use it in the add-on list
This commit is contained in:
Ali El Gariani 2007-09-03 20:33:30 +00:00
parent 7a9e9dc840
commit ce9701c318
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/image.cpp
View file

@ -327,28 +327,25 @@ surface locator::load_image_sub_file() const
}
std::string field = *j++;
if("TC" == function){ // Deprecated team coloring syntax
//! @todo replace with proper RC syntax
std::string::size_type pos = 0;
pos = field.find(',');
if (pos == std::string::npos)
if("TC" == function){
std::vector<std::string> param = utils::split(field,',');
if(param.size() < 2)
break;
std::string f1,f2;
int side_n = lexical_cast_default<int>(field.substr(0,pos),-1);
if (side_n < 1)
break;
else if (side_n < static_cast<int>(team_colors.size())) {
f1 = team_colors[side_n-1];
int side_n = lexical_cast_default<int>(param[0], -1);
std::string team_color;
if (side_n < 1) {
break;
} else if (side_n < static_cast<int>(team_colors.size())) {
team_color = team_colors[side_n - 1];
} else {
// this side is not inialized use default "n"
f1 = lexical_cast<std::string>(side_n);
// this side is not inialized use default "n"
team_color = lexical_cast<std::string>(side_n);
}
f2 = field.substr(pos+1);
if(game_config::tc_info(f2).size()){
if(game_config::tc_info(param[1]).size()){
function="RC";
field= f2 + ">" + f1;
field = param[1] + ">" + team_color;
}
}