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

Converted objective dialog box to Pango markup.

Browse source
This commit is contained in:
Guillaume Melquiond 2009-05-31 17:20:24 +00:00
parent b9a10d95bc
commit 2ee50c09dc
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/lua/wml-tags.lua
View file

@ -27,6 +27,14 @@ local function trim(s)
return r
end
local function color_prefix(r, g, b)
return string.format('<span foreground="#%02x%02x%02x">', r, g, b)
end
local function insert_before_nl(s, t)
return string.gsub(tostring(s), "[^\n]*", "%0" .. t, 1)
end
local function generate_objectives(cfg, team, silent)
local _ = wesnoth.textdomain("wesnoth")
local objectives = ""
@ -53,9 +61,11 @@ local function generate_objectives(cfg, team, silent)
if show_if then
local condition = obj.condition
if condition == "win" then
win_objectives = win_objectives .. "@" .. obj.description .. "\n"
win_objectives = win_objectives .. color_prefix(0, 255, 0) ..
insert_before_nl(obj.description, "</span>") .. "\n"
elseif condition == "lose" then
lose_objectives = lose_objectives .. "#" .. obj.description .. "\n"
lose_objectives = lose_objectives .. color_prefix(255, 0 ,0) ..
insert_before_nl(obj.description, "</span>") .. "\n"
else
wesnoth.message "Unknown condition, ignoring."
end
@ -64,13 +74,13 @@ local function generate_objectives(cfg, team, silent)
local summary = cfg.summary
if summary then
objectives = "*" .. summary .. "\n"
objectives = "<big>" .. insert_before_nl(summary, "</big>") .. "\n"
end
if win_objectives ~= "" then
objectives = objectives .. "*" .. win_string .. "\n" .. win_objectives
objectives = objectives .. "<big>" .. win_string .. "</big>\n" .. win_objectives
end
if lose_objectives ~= "" then
objectives = objectives .. "*" .. lose_string .. "\n" .. lose_objectives
objectives = objectives .. "<big>" .. lose_string .. "</big>\n" .. lose_objectives
end
return objectives

5
src/dialogs.cpp
View file

@ -236,10 +236,11 @@ void show_objectives(game_display& disp, const config& level, const std::string&
replace_underbar2space(campaign_name);
/** @todo We can now allow pango markup for the objectives if wanted. */
gui2::show_transient_message(disp.video(), "", "*~" + name +
gui2::show_transient_message(disp.video(), "",
"<big><b>" + name + "</b></big>" +
(campaign_name.empty() ? "\n" : " - " + campaign_name + "\n") +
(objectives.empty() ? no_objectives : objectives),
gui2::tcontrol::WML_MARKUP);
gui2::tcontrol::PANGO_MARKUP);
}
namespace {