upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 21:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made the fake map border behave the same as off-map in the interface

Browse Source
This commit is contained in:
ln-zookeeper 2017-03-16 10:51:56 +02:00
parent a463ad7272
commit bc89306090
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widgets/unit_preview_pane.cpp
View File

@ -151,7 +151,7 @@ static inline std::string get_mp_tooltip(int total_movement, std::function<int (
}
for(t_translation::terrain_code terrain : preferences::encountered_terrains()) {
if(terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || terrain == t_translation::OFF_MAP_USER) {
if(terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP)) {
continue;
}

2
src/help/help_topic_generators.cpp
View File

@ -633,7 +633,7 @@ std::string unit_topic_generator::operator()() const {
for (; terrain_it != preferences::encountered_terrains().end();
++terrain_it) {
const t_translation::terrain_code terrain = *terrain_it;
if (terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || terrain == t_translation::OFF_MAP_USER) {
if (terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP)) {
continue;
}
const terrain_type& info = tdata->get_terrain_info(terrain);

12
src/reports.cpp
View File

@ -598,7 +598,7 @@ static config unit_moves(reports::context & rc, const unit* u)
for (; terrain_it != preferences::encountered_terrains().end();
++terrain_it) {
const t_translation::terrain_code terrain = *terrain_it;
if (terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || terrain == t_translation::OFF_MAP_USER)
if (terrain == t_translation::FOGGED || terrain == t_translation::VOID_TERRAIN || t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP))
continue;
const terrain_type& info = rc.map().get_terrain_info(terrain);
@ -1190,7 +1190,7 @@ static config unit_box_at(reports::context & rc, const map_location& mouseover_h
const gamemap &map = rc.map();
t_translation::terrain_code terrain = map.get_terrain(mouseover_hex);
//if (terrain == t_translation::OFF_MAP_USER)
//if (t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP))
// return config();
//if (map.is_keep(mouseover_hex)) {
@ -1352,7 +1352,7 @@ REPORT_GENERATOR(terrain_info, rc)
return config();
t_translation::terrain_code terrain = map.get_terrain(mouseover_hex);
if (terrain == t_translation::OFF_MAP_USER)
if (t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP))
return config();
config cfg;
@ -1374,7 +1374,7 @@ REPORT_GENERATOR(terrain_info, rc)
const t_translation::ter_list& underlying_terrains = map.underlying_union_terrain(terrain);
for (const t_translation::terrain_code& underlying_terrain : underlying_terrains) {
if (underlying_terrain == t_translation::OFF_MAP_USER)
if (t_translation::terrain_matches(underlying_terrain, t_translation::ALL_OFF_MAP))
continue;
const std::string& terrain_id = map.get_terrain_info(underlying_terrain).id();
const std::string& terrain_name = map.get_terrain_string(underlying_terrain);
@ -1396,7 +1396,7 @@ REPORT_GENERATOR(terrain, rc)
return config();
t_translation::terrain_code terrain = map.get_terrain(mouseover_hex);
if (terrain == t_translation::OFF_MAP_USER)
if (t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP))
return config();
std::ostringstream str;
@ -1451,7 +1451,7 @@ REPORT_GENERATOR(position, rc)
}
t_translation::terrain_code terrain = map[mouseover_hex];
if (terrain == t_translation::OFF_MAP_USER)
if (t_translation::terrain_matches(terrain, t_translation::ALL_OFF_MAP))
return config();
std::ostringstream str;

1
src/terrain/translation.cpp
View File

@ -141,6 +141,7 @@ const terrain_code NOT = string_to_number_("!");
const terrain_code STAR = string_to_number_("*");
const terrain_code BASE = string_to_number_("_bas");
const ter_match ALL_OFF_MAP("_off^_usr,*^_fme");
const ter_match ALL_FORESTS("F*,*^F*");
const ter_match ALL_HILLS("!,*^V*,!,H*");
const ter_match ALL_MOUNTAINS("!,*^V*,!,M*"); //excluding impassable mountains

1
src/terrain/translation.hpp
View File

@ -164,6 +164,7 @@ namespace t_translation {
extern const terrain_code STAR; // *
extern const terrain_code BASE; // references the base terrain in movement/defense aliases
extern const ter_match ALL_OFF_MAP;
extern const ter_match ALL_FORESTS;
extern const ter_match ALL_HILLS;
extern const ter_match ALL_MOUNTAINS; //excluding impassable mountains