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

[object] description messages are now shown using GUI2's transient_message

Browse source 
This allows usage of Pango markup in object.description fields, and
fixes bug #16859.
This commit is contained in:
Ignacio R. Morelle 2010-10-27 20:15:09 +00:00
parent b63bdf39a9
commit 299a248d91
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -65,6 +65,8 @@ Version 1.9.1+svn:
* Fixed: No longer cut off large title screen logos (bug #16632).
* Refresh cache (F5) works in editor.
* Add a "Save All Maps" menu item and hotkey in editor.
* [object] description messages are now shown using GUI2, allowing usage of Pango
markup (bug #16859).
* Whiteboard planning system:
* Fixed: Crash when creating a planned move on Windows (bug #16705)
* New "Execute all actions" command bound to CTRL+y

17
src/game_events.cpp
View file

@ -29,6 +29,7 @@
#include "game_preferences.hpp"
#include "gettext.hpp"
#include "gui/dialogs/gamestate_inspector.hpp"
#include "gui/dialogs/transient_message.hpp"
#include "gui/dialogs/wml_message.hpp"
#include "gui/widgets/window.hpp"
#include "help.hpp"
@ -1729,25 +1730,11 @@ WML_HANDLER_FUNCTION(object, event_info, cfg)
if (!cfg["silent"].to_bool())
{
surface surface(NULL);
if(image.empty() == false) {
surface.assign(image::get_image(image));
}
// Redraw the unit, with its new stats
resources::screen->draw();
try {
unsigned lifetime = average_frame_time
* cfg["duration"].to_int(prevent_misclick_duration);
wml_event_dialog to_show(*resources::screen, (surface.null() ? caption : ""), text);
if(!surface.null()) {
to_show.set_image(surface, caption);
}
to_show.layout();
to_show.show(lifetime);
gui2::show_transient_message(resources::screen->video(), caption, text, image, true);
} catch(utils::invalid_utf8_exception&) {
// we already had a warning so do nothing.
}