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

Merge branch 'LovCAPONE-NontransStrTooltipTerrainIcon'

Browse source
This commit is contained in:
Ignacio R. Morelle 2014-10-03 22:28:53 -03:00
commit d5de2bf7ba
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -326,6 +326,7 @@ Version 1.13.0-dev:
* Fix issue where the chatlog for a replayed game could not be opened in single player.
The chatlog can now always be opened.
* Fix bug #22745: choose_track function crashes the game in certain cases
* Fix bug #22650: nontranslatable strings displayed in tooltips for terrain icons
Version 1.11.11:
* Add-ons server:

8
src/reports.cpp
View file

@ -1338,10 +1338,11 @@ REPORT_GENERATOR(income, rc)
}
namespace {
void blit_tced_icon(config &cfg, const std::string &terrain_id, const std::string &icon_image, bool high_res) {
void blit_tced_icon(config &cfg, const std::string &terrain_id, const std::string &icon_image, bool high_res,
const std::string &terrain_name) {
const std::string tc_base = high_res ? "images/buttons/icon-base-32.png" : "images/buttons/icon-base-16.png";
const std::string terrain_image = "terrain/" + icon_image + (high_res ? "_30.png" : ".png");
add_image(cfg, tc_base + "~RC(magenta>" + terrain_id + ")~BLIT(" + terrain_image + ")", terrain_id);
add_image(cfg, tc_base + "~RC(magenta>" + terrain_id + ")~BLIT(" + terrain_image + ")", terrain_name);
}
}
@ -1383,10 +1384,11 @@ REPORT_GENERATOR(terrain_info, rc)
if (underlying_terrain == t_translation::OFF_MAP_USER)
continue;
const std::string& terrain_id = map.get_terrain_info(underlying_terrain).id();
const std::string& terrain_name = map.get_terrain_string(underlying_terrain);
const std::string& terrain_icon = map.get_terrain_info(underlying_terrain).icon_image();
if (terrain_icon.empty())
continue;
blit_tced_icon(cfg, terrain_id, terrain_icon, high_res);
blit_tced_icon(cfg, terrain_id, terrain_icon, high_res, terrain_name);
}
return cfg;
}