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

Properly correct the broken Desert Sands / Oasis help entry (bug #23023)

Browse source 
Reverts the previous change to the terrain.cfg and allows the terrain code to fall back to name if editor name is unavailable.
This commit is contained in:
Wedge009 2015-10-30 00:10:14 +11:00
parent b549ac258c
commit 63788d5f4a
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/core/terrain.cfg
View file

@ -315,7 +315,6 @@ Most units receive 20 to 40% defense in sand."
symbol_image=sand/desert-oasis
id=oasis
name= _ "Oasis"
editor_name= _ "Oasis"
default_base=Dd
string=^Do
aliasof=_bas

2
src/terrain.cpp
View file

@ -203,7 +203,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_),
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
description_(overlay.description()),
help_topic_text_(),
number_(t_translation::t_terrain(base.number_.base, overlay.number_.overlay)),