[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-14 Thread bunnybot
Continuous integration builds have changed state: Travis build 3054. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/328811067. Appveyor build 2862. State: success. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-14 Thread bunnybot
Continuous integration builds have changed state: Travis build 3053. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/328793965. Appveyor build 2861. State: success. Details:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-14 Thread Teppo Mäenpää
Hello, Klaus, Since you asked: Does the line like "return forester_cache[mi] = correct_val;" bring any performance benefits? I know it is valid and all, but the old way (separate assignment and returning) is more intuitive. Not everybody reading the source are professionals, especially C/C++

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-14 Thread hessenfarmer
have playtested the scenarios. They all worked fine. Now the texts should be consistent with each other as well as with mission 1 and 2 -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is requested to review the proposed

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands

2018-01-14 Thread hessenfarmer
hessenfarmer has proposed merging lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1742273 in widelands: "wrong strings and errors in empire mission 4"

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-14 Thread Klaus Halfmann
Review: Approve rerview, compile debug, test Hello Teppo, I did some small changes, I hope you agree. I assume this will improve efiicency of tree planting quite a lot, thus chnageing the balance of existing maps. To stick to the ideas of widelands a "tree planter" should become a "power

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands

2018-01-14 Thread Klaus Halfmann
You shoud make the -1 a constexpr, e.g. > constexpr int16_t kInvalidForesterEntry = -1; Now, after more thinking, forester_cache_ must be member of some gameobject. Otherwise it may happen, that * a cache from some previous game is used for a different map. * In case of a network game bothe

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands-website/better_notification_mail into lp:widelands-website

2018-01-14 Thread kaputtnik
I've made a failure recently by updating django-messages to a wrong version. https://wl.widelands.org/forum/topic/4196/ I fixed it in trunk and also in this branch, which means we need to keep the templates in templates/notification/messages_*/full_text --