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

Fix a logic change I did attempting to optimize image path recognition

Browse source 
calling std::basic_string<...>::operator== less times; it broke ~TC()
since it relies on a dirty change to revalidate it as ~RC() later.
This commit is contained in:
Ignacio R. Morelle 2008-09-18 02:38:46 +00:00
parent d38898e551
commit e0253e004b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/image.cpp
View file

@ -377,6 +377,12 @@ surface locator::load_image_sub_file() const
}
std::string field = *j++;
// ~TC() is the only function which is an alias to another one,
// so it must be out of the if-elseif chain.
/** @todo: move RC functionality into a different method
* that is called by both functions to avoid the
* unneeded load of string comparison.
*/
if("TC" == function){
std::vector<std::string> param = utils::split(field,',');
if(param.size() < 2)
@ -398,7 +404,8 @@ surface locator::load_image_sub_file() const
field = param[1] + ">" + team_color;
}
}
else if("RC" == function){ // Re-color range/palette function
if("RC" == function){ // Re-color range/palette function
std::vector<std::string> recolor=utils::split(field,'>'); // recolor palette to range
if(recolor.size()>1){
std::map<Uint32, Uint32> tmp_map;