upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 00:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #806 from Pentarctagon/Pentarctagon-two-portraits-fix

Browse Source 
Pentarctagon two portraits fix
This commit is contained in:
Charles Dang 2016-10-02 09:36:56 +11:00 committed by GitHub
commit cb46968285
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/gui/window/wml_message.cfg
View File

@ -753,19 +753,6 @@ if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH}
{_GUI_WML_MESSAGE_CONTENT}
[column]
[spacer]
width = "(
if(gamemap_width - (10 + ({__GUI_IMAGE_WIDTH})) > {MAX_TEXT_WIDTH}
, gamemap_width - (10 + ({__GUI_IMAGE_WIDTH}) + {MAX_TEXT_WIDTH})
, 0
))"
height = 75
[/spacer]
[/column]
[column]
[spacer]

3
data/lua/wml/message.lua
View File

@ -200,6 +200,9 @@ local function message_user_choice(cfg, speaker, options, text_input)
title = caption,
message = cfg.message,
portrait = image,
mirror = cfg.mirror,
second_portrait = cfg.second_image,
second_mirror = cfg.second_mirror,
}
if speaker ~= nil then