upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 20:06:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Look in more locations for the description of mixed terrain

Browse Source 
If overlay description not present, try overlay name, then base description
Fixes bug #19411
This commit is contained in:
Simon Forsyth 2012-02-08 01:30:49 +00:00
parent 82215caef6
commit 81f3519ae4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/terrain.cpp
View File

@ -178,7 +178,7 @@ terrain_type::terrain_type(const terrain_type& base, const terrain_type& overlay
id_(base.id_+"^"+overlay.id_), id_(base.id_+"^"+overlay.id_),
name_(overlay.name_), name_(overlay.name_),
editor_name_(overlay.editor_name_), editor_name_(overlay.editor_name_),
description_(overlay.description_), description_(overlay.description()),
number_(t_translation::t_terrain(base.number_.base, overlay.number_.overlay)), number_(t_translation::t_terrain(base.number_.base, overlay.number_.overlay)),
mvt_type_(overlay.mvt_type_), mvt_type_(overlay.mvt_type_),
def_type_(overlay.def_type_), def_type_(overlay.def_type_),
@ -202,7 +202,10 @@ terrain_type::terrain_type(const terrain_type& base, const terrain_type& overlay
editor_default_base_(), editor_default_base_(),
hide_in_editor_(base.hide_in_editor_ || overlay.hide_in_editor_) hide_in_editor_(base.hide_in_editor_ || overlay.hide_in_editor_)
{ {
if(description_.empty()) {
description_ = base.description();
}
if(overlay.height_adjust_set_) { if(overlay.height_adjust_set_) {
height_adjust_set_ = true; height_adjust_set_ = true;
height_adjust_ = overlay.height_adjust_; height_adjust_ = overlay.height_adjust_;