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

Merge pull request #366 from Vultraz/master

Browse source 
Allow [message] image= to have 'none' as a value
This commit is contained in:
Charles Dang 2015-01-12 19:59:33 +11:00
commit 98035521aa
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_events/action_wml.cpp
View file

@ -311,6 +311,11 @@ namespace { // Support functions
std::string get_image(const vconfig& cfg, unit_map::iterator speaker)
{
std::string image = cfg["image"];
if (image == "none") {
return "";
}
if (image.empty() && speaker != resources::units->end())
{
image = speaker->big_profile();