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

Fix bug #21282

Browse source
This commit is contained in:
fendrin 2013-11-19 00:57:00 +01:00
parent 6fe2267f80
commit 8607866d12
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/editor/action/mouse/mouse_action.cpp
View file

@ -145,10 +145,8 @@ bool mouse_action::has_ctrl_modifier() const
void mouse_action::set_terrain_mouse_overlay(editor_display& disp, const t_translation::t_terrain & fg,
const t_translation::t_terrain & bg)
{
surface image_fg(image::get_image("terrain/"
+ disp.get_map().get_terrain_info(fg).editor_image() + ".png"));
surface image_bg(image::get_image("terrain/"
+ disp.get_map().get_terrain_info(bg).editor_image() + ".png"));
surface image_fg(image::get_image(disp.get_map().get_terrain_info(fg).editor_image()));
surface image_bg(image::get_image(disp.get_map().get_terrain_info(bg).editor_image()));
if (image_fg == NULL || image_bg == NULL) {
ERR_ED << "Missing terrain icon\n";

4
src/editor/palette/terrain_palettes.cpp
View file

@ -164,7 +164,7 @@ void terrain_palette::draw_item(const t_translation::t_terrain& terrain,
//Draw default base for overlay terrains
if(base_terrain != t_translation::NONE_TERRAIN) {
const std::string base_filename = "terrain/" + map().get_terrain_info(base_terrain).editor_image() + ".png";
const std::string base_filename = map().get_terrain_info(base_terrain).editor_image();
surface base_image(image::get_image(base_filename));
if(base_image == NULL) {
@ -183,7 +183,7 @@ void terrain_palette::draw_item(const t_translation::t_terrain& terrain,
}
}
const std::string filename = "terrain/" + map().get_terrain_info(terrain).editor_image() + ".png";
const std::string filename = map().get_terrain_info(terrain).editor_image();
image = image::get_image(filename);
if(image == NULL) {
tooltip_text << "IMAGE NOT FOUND\n";