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

Ensure base editor name can fall back to base name (in addition to overlay fall back).

Browse source
This commit is contained in:
Wedge009 2015-10-30 22:30:56 +11:00
parent f421d837f7
commit 769807e085
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/terrain.cpp
View file

@ -199,7 +199,7 @@ terrain_type::terrain_type(const terrain_type& base, const terrain_type& overlay
editor_image_(base.editor_image_ + "~BLIT(" + overlay.editor_image_ +")"),
id_(base.id_+"^"+overlay.id_),
name_(overlay.name_),
editor_name_(base.editor_name_ + " / " + (overlay.editor_name_.empty() ? overlay.name_ : overlay.editor_name_)), // Resolve Bug #23023: fall back to overlay name if overlay editor name is empty
editor_name_((base.editor_name_.empty() ? base.name_ : base.editor_name_) + " / " + (overlay.editor_name_.empty() ? overlay.name_ : overlay.editor_name_)),
description_(overlay.description()),
help_topic_text_(),
number_(t_translation::t_terrain(base.number_.base, overlay.number_.overlay)),