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

<Xan|> image.cpp: after line 132 add val_.type_ = SUB_FILE;

Browse source 
<Xan|> And remove the else clause on line 304
<Xan|> And the Eastern Invasion campaign cfg has a typo in the icon path.
This commit is contained in:
Patrick Parker 2006-07-21 05:37:23 +00:00
parent fd036a6675
commit d5aa645603
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Eastern_Invasion.cfg
View file

@ -6,7 +6,7 @@
id=eastern_invasion
rank=30
#textdomain wesnoth-ei
icon=units/human-loyalists/general.png~TC~TC(1,magenta)
icon=units/human-loyalists/general.png~TC(1,magenta)
name= _ "The Eastern Invasion"
define=CAMPAIGN_EASTERN_INVASION
first_scenario=The_Outpost

5
src/image.cpp
View file

@ -130,6 +130,7 @@ void locator::get_tc_info(const std::string& field)
std::string color_id = field.substr(comma+1);
val_.new_color = team::get_side_color_range(team_n);
val_.swap_colors = game_config::tc_info(color_id);
val_.type_ = SUB_FILE;
}
void locator::parse_arguments()
{
@ -301,10 +302,6 @@ surface locator::load_image_file() const
if (res.null()) {
ERR_DP << "could not open image '" << val_.filename_ << "'\n";
} else {
if(val_.swap_colors.size()){
res=recolor_image(res,get_new_color(),get_swap_colors());
}
}
return res;