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

Campaign Difficulty: cleaned up a few things left over from 50a3960

Browse source 
Also a small logic cleanup.
This commit is contained in:
Charles Dang 2018-05-15 19:02:06 +11:00
parent 50a3960abd
commit 3d73dfdb15
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/dialogs/campaign_difficulty.cpp
View file

@ -19,7 +19,6 @@
#include "config.hpp"
#include "formatter.hpp"
#include "gui/auxiliary/find_widget.hpp"
#include "gui/auxiliary/old_markup.hpp"
#include "preferences/game.hpp"
#ifdef GUI2_EXPERIMENTAL_LISTBOX
#include "gui/widgets/list.hpp"
@ -29,7 +28,6 @@
#include "gui/widgets/window.hpp"
#include "log.hpp"
#include "serialization/string_utils.hpp"
#include "deprecation.hpp"
static lg::log_domain log_wml("wml");
#define WRN_WML LOG_STREAM(warn, log_wml)
@ -106,12 +104,10 @@ void campaign_difficulty::pre_show(window& window)
item["label"] = d["label"];
data.emplace("label", item);
const std::string descrip_text = d["old_markup"].to_bool() || d["description"].empty()
? d["description"]
: (formatter() << "(" << d["description"].str() << ")").str();
item["label"] = descrip_text;
data.emplace("description", item);
if(!d["description"].empty()) {
item["label"] = (formatter() << "(" << d["description"].str() << ")").str();
data.emplace("description", item);
}
grid& grid = list.add_row(data);