Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-barbarians1 into lp:widelands

2018-01-27 Thread Klaus Halfmann
Found only some obvious reformattings, LGTM. Two questions inline. Will do a testplay today in German an check for missing translations and formatting issues. ./wideland --scenario=/data/campaigns/bar01.wmf/ Aahh. thron is the name of one of the characters :-) Diff comments: > === modified

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

2018-01-27 Thread SirVer
you are right, we should probably codify our style somewhere - since we are only using parts of the google c++ style. we have a long history of boost usage in Widelands, so we continue using it. We also have used exceptions a lot in the past, so we also continue using them. Were we a greenfield

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

2018-01-27 Thread Teppo Mäenpää
I will take note for future. Thanks. I cannot resist asking: The Google C++ style guide disallows boost, with exceptions; lexical_cast is not mentioned in the list of allowed uses. How strictly should one follow the style guide? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379

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

2018-01-27 Thread GunChleoc
One more comment for the future: You could use boost::lexical_cast instead of "int ival = strtol(value.c_str(), nullptr, 10);" -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/wi

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

2018-01-27 Thread GunChleoc
I completely misunderstood his comment, I thought he meant the repetition of "we". "sparingly" is wrong grammar. You can change it to "frugal" if you want. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is subscribed to

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

2018-01-27 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 -- Your team Widelands Developers i

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

2018-01-27 Thread Teppo Mäenpää
Forgot the commit message. I guess bunnybot is not offended by repeated requests. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1574379-foreste

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

2018-01-27 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands has been updated. Commit Message changed to: Bug 1574379: Forester prefers good soil, and is thus more efficient. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-f

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

2018-01-27 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands has been updated. Commit Message changed to: Bug 1574379: Forester prefers good soil. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 --

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

2018-01-27 Thread Teppo Mäenpää
I understood the Jan14th comments so that it is okay to merge this. @bunnybot merge Curious to see what happens. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1

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

2018-01-27 Thread bunnybot
Continuous integration builds have changed state: Travis build 3102. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/334024010. Appveyor build 2909. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_157437