widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #15875
[Merge] lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands.
Commit message:
add parameter to send_message() to avoid an error
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/coroutine-error-collectors/+merge/362956
I introduced this in r8973 because I forgot to set the popup parameter for the "You won/lost messages".
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/coroutine-error-collectors into lp:widelands.
=== modified file 'data/scripting/win_conditions/collectors.lua'
--- data/scripting/win_conditions/collectors.lua 2019-02-09 16:46:36 +0000
+++ data/scripting/win_conditions/collectors.lua 2019-02-10 23:39:17 +0000
@@ -194,10 +194,10 @@
local lost_or_won = 0
if (info[2] < win_points) then
lost_or_won = 0
- send_message(player, lost_game_over.title, lost_game_over.body)
+ send_message(player, lost_game_over.title, lost_game_over.body, {popup = false})
else
lost_or_won = 1
- send_message(player, won_game_over.title, won_game_over.body)
+ send_message(player, won_game_over.title, won_game_over.body, {popup = false})
end
if (count_factions(plrs) > 1) then
if (player.team == 0) then
Follow ups