widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

You can use bzr shelve for resolving conflicts like this. At least the changes are still there :)

I'd move

msg_boxes(barracks_story_end)

before the sleep time, or split up the sleep time. The way it is now, it will take a long time for the player to receive the confirmation, and it will be followed by the trainingsite introduction immediately. You can add a custom sleep time to set_objective_done(o) as a second parameter to have less lines in the code.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1661220-campaigns-barracks/+merge/317033
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands.