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

2018-08-03 Thread Teppo Mäenpää
Now I got it, thanks. -- https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ferry into lp:widelands. ___ Mailing list:

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

2018-08-03 Thread Teppo Mäenpää
I get a compiler error on 8780: ../src/logic/map_objects/tribes/ferry.cc: In member function ‘void Widelands::Ferry::start_task_row(Widelands::Game&, Widelands::Waterway*)’: ../src/logic/map_objects/tribes/ferry.cc:106:17: error: invalid conversion from ‘const value_type*’ {aka ‘const

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning into lp:widelands

2018-03-09 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1753248-crystalmine-tuning into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1753248 in widelands: "Rework Atlantean Crystal Mine" https://bugs.launchpad.net/wide

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
When may I conclude that bunnybot has, once again, decided not to merge. What is the problem this time? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is subscribed to branch

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-17 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Commit Message changed to: Minor fixes to Last Bastion map. See LP bug 1669230 for details. For more details, see:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-14 Thread Teppo Mäenpää
@GunChleoc: Thanks for spotting, is this okay now? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1669230-lastbastion-finetune/+merge/337083 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-02 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1669230 in widelands: "Map Last Bastion: enemy fortifications on the other side of water make

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

2018-02-02 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands has been updated. Description changed to: Last bastion map modified: The red player now has a way to expand around a tower at 10/57. It is not very convenient, but at least the blue can no

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands

2018-01-29 Thread Teppo Mäenpää
The appveyor build failed after 31 seconds from start, supposing that that was unrelated to this. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746030-scout-assert-failures/+merge/336787 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands

2018-01-29 Thread Teppo Mäenpää
Many hours of playtesting (self and network), and then trouble with travis and all and finally SirVer had to do a manual merge (crisscross). Guess how stupid it feels when after all this, all related testgames fail immediately.. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands

2018-01-29 Thread Teppo Mäenpää
Maybe, this time, we can trust that the if-statement in the preceding line is free of any bugs and those two thus have a similar truth table. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746030-scout-assert-failures/+merge/336787 Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands

2018-01-29 Thread Teppo Mäenpää
Low hanging fruit: It should not take long to conclude that this is an improvement ;-) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746030-scout-assert-failures/+merge/336787 Your team Widelands Developers is requested to review the proposed merge of

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands

2018-01-29 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1746030-scout-assert-failures into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1746030 in widelands: "Recent scout improvement has assert failures" https://bugs.lau

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? --

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

[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:

[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

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

2018-01-24 Thread Teppo Mäenpää
intended to say "comment" in the above. -- 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-forester-wit. ___

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

2018-01-21 Thread Teppo Mäenpää
Got the random error, again. I guess bunnybot will not merge now. If we cannot alter the way the infra works, would it be possible to work around? What do the scripts look like ? If the errors are truly random, one could try command || (sleep 10 && command) || $(sleep 10 && command) or, in this

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

2018-01-21 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: For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 -- Your team Widelands Developers is

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

2018-01-21 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 -- Your team Widelands

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

2018-01-21 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 -- Your team Widelands

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

2018-01-21 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: Forester prefers good soil for planting. Fixes bug #1574379. For more details, see:

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

2018-01-21 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: Forester prefers good soil for planting. Fixes but #1574379. For more details, see:

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

2018-01-21 Thread Teppo Mäenpää
Side note: Yes, it is gone. -- 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-forester-wit. ___ Mailing list:

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

2018-01-21 Thread Teppo Mäenpää
I have been pretty unlucky with Travis and appveyor. A new commit just to merge trunk sounds scary already. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch

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

2018-01-21 Thread Teppo Mäenpää
Played more. No problems. IMO, merge-quality again. Side note: WuiPlotArea::register_plot_data leaks memory according to valgrind, is this known? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch

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

2018-01-20 Thread Teppo Mäenpää
Tried to get the assert for ~2 hours, without success. -- 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-forester-wit.

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

2018-01-19 Thread Teppo Mäenpää
I currently mostly write code using language, where single equal sign is a comparison instead of assignment. A side-effect is that "return a = b" looks very boolean to my eyes.. About the cache_entry > kInvalidForesterEntry: You are right, this is more robust, even if it looks weird. I'll add

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/bug-1574379-forester-wit into lp:widelands

2018-01-13 Thread Teppo Mäenpää
Klaus: I did not quite get the first sentence either: If you build on fertile land, there will be less fertile land for the forest. This has not changed. The fertile land is now used more effectively than previously, but that was the whole point of this ticket, I guess? No messages were

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

2018-01-13 Thread Teppo Mäenpää
Hello, Thanks for the comments. The key name "saplingsearches" is silly, and should be replaced by ... hmm, what? Any English-speaking people here? The larger the saplingsearches-number is, the smaller the odds that the forester plants the tree to marginal land. This becomes important when

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

2018-01-13 Thread Teppo Mäenpää
This is quite simple implementation, and seems to work OK in most cases. There are some things which I am not perfectly happy with: - There are quite many nested loops. I worked around by a cache, but that spawns other issues: -- If the map is changes during a game, via LUA scripting, the

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

2018-01-13 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1574379 in widelands: "Forester plants trees where probability to grow is nearly zero&quo

Re: [Widelands-dev] [Merge] lp:~kxq/widelands/feature-1656664-scout-improvement into lp:widelands

2017-12-16 Thread Teppo Mäenpää
Actually, revealing the unknown territory might not take that much longer: - Vision range was increment by one, which speeds up the sweeping efficiency quite much; - Walking near the military sites reveals tiny bits of landscape, too. --

Re: [Widelands-dev] [Merge] lp:~kxq/widelands/feature-1656664-scout-improvement into lp:widelands

2017-12-16 Thread Teppo Mäenpää
Thanks for the quick reply. Currently (=BZR8529) the scout does random walk about something between ~34 and 100% of the time: 100% if no enemy military sites are near, and ~34% when there are many enemy military sites nearby. When the scout is wandering randomly, it prefers unseen places if any

[Widelands-dev] [Merge] lp:~kxq/widelands/feature-1656664-scout-improvement into lp:widelands

2017-12-16 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~kxq/widelands/feature-1656664-scout-improvement into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1656664 in widelands: "Scouts are a sore point of this game." https://bugs.launchpad.net/wide

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1442869 into lp:widelands

2015-05-06 Thread Teppo Mäenpää
The proposal to merge lp:~widelands-dev/widelands/bug-1442869 into lp:widelands has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1442869/+merge/258203 -- Your team Widelands Developers is requested to review

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1451078-fix into lp:widelands

2015-05-03 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1451078-fix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1451078 in widelands: labyrinth malfunctions full report https://bugs.launchpad.net/widelands/+bug/1451078 For more

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1451078-fix into lp:widelands

2015-05-03 Thread Teppo Mäenpää
I did not remove the check. Previously, if the soldier was at a too high level, it was assumed that he/she should be let go. In the linked bug, the problem was that soldier was full trained in defense and health but not evade. After this change, the code merely proceeds to next check, which

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1451078-fix into lp:widelands

2015-05-03 Thread Teppo Mäenpää
I am not sure if I was speaking clearly. here, both break (old way) and continue (new way) skip the rest of the test. As a result of this, the soldier is not declared trainable in either case. However, the old way caused the code to skip subsequent arts, which was bad if those trainings were

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1451078-fix into lp:widelands

2015-05-03 Thread Teppo Mäenpää
I am really sorry, but do not see the benefit of adding more booleans. In my opinion the bug is now fixed, unless you or somebody else explain the remaining problems in so simple words that even I understand. Hopefully all the extra typing won't give you joint pains. --

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

2014-07-14 Thread Teppo Mäenpää
another layer of compatibility code, which I'd rather avoid. Could this be in one of those cases where polishing the English should be done at Widelands-to British/American/whatever translations instead of the Widelands code itself? --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmake-reworked into lp:widelands

2014-06-21 Thread Teppo Mäenpää
=== Long answer (shorter below) === command target_include_directories ( found in src/CMakeLists.txt:62 ) is not supported by cmake 2.8.9, which is what debian wheezy (=current stable) uses. The next Debian release, which ships a new-enough cmake, is planned in early 2015. So-called backports

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1292828-cleanup into lp:widelands

2014-04-22 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-1292828-cleanup into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1292828 in widelands: src/map_io/widelands_map_buildingdata_data_packet.cc has a variable rel17comp which can

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands

2014-04-13 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands

2014-04-09 Thread Teppo Mäenpää
Review: Needs Fixing The training problem is present in other shallow empire mines. too. -- https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge/214822 Your team Widelands Developers is subscribed to branch

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands

2014-04-08 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands

2014-04-08 Thread Teppo Mäenpää
https://wl.widelands.org/forum/topic/1478/ -- https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge/214822 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-loudylobby into lp:widelands

2014-04-02 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/feature-loudylobby into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1278026 in widelands: Waiting for participants in the metaserver lobby is not fun. https://bugs.launchpad.net

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/feature-loudylobby into lp:widelands

2014-02-22 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/feature-loudylobby into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1278026 in widelands: Waiting for participants in the metaserver lobby is not fun. https://bugs.launchpad.net

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-bug-1235562-fix into lp:widelands

2013-10-15 Thread Teppo Mäenpää
Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/bug-bug-1235562-fix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1235562 in widelands: Green player cannot expand in Rendez-Vous map https://bugs.launchpad.net/widelands/+bug

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

2013-09-14 Thread Teppo Mäenpää
I had only this version file and the worries of SirVer, expressed in the bug discusssion, in mind while making the _compatibility flag. I agree that a global forward compatibility handling would be useful, even for savegames, but that would require one additional processing layer to saving and

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-bug-1208130 into lp:widelands

2013-08-09 Thread Teppo Mäenpää
Widelands is the most heavy-weight application I have ever used (off-work, that is), by a wide margin. My computer is just slow, CPU-wise. It only hurts when working with widelands, in all other cases I prefer my no-moving-parts-except-in-the-keyboard approach. It is faster than raspberrypi..

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

2013-07-27 Thread Teppo Mäenpää
typo: Without this check - Without this patch -- https://code.launchpad.net/~widelands-dev/widelands/soldierselect_radiobutton/+merge/176784 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/soldierselect_radiobutton.

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

2013-07-25 Thread Teppo Mäenpää
About trainingsites: How should these options differ? Currently, there is an option regarding whether the trainingsite attempts to train least-trained guy or most-trained guy, if there are more than one tha could be trained in a step. There is no UI for that. Also, it would be relatively easy