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

2014-07-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1344350 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1344350 in widelands: "Constructionsites/dismantlesites only show a dot instead of building image" https://bugs.launchpad.net

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1341674_codecheck into lp:widelands

2014-07-25 Thread GunChleoc
Review: Resubmit Trunk is merged :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341674_codecheck/+merge/227936 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341674_codecheck. ___ Mailing list:

Re: [Widelands-dev] Fwd: can find any more resources

2014-07-25 Thread Holger Rapp
Hooray \o/ !!! On 25.07.2014, at 22:23, Tibor Bamhor wrote: > I will look at it...and do what I can.. > > > 2014-07-25 22:08 GMT+02:00 Holger Rapp : > Which just strengthens my argument, right? The code there is already copy and > pasted and if anything changes you have to change it twice. Wi

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

2014-07-25 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1203629 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 -- https://code.launchpad.net/~widelands-dev/widelands/bug-12

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

2014-07-25 Thread SirVer
Review: Needs Fixing Actually, there are still a bunch of merge conflicts with trunk. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1203629.

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

2014-07-25 Thread SirVer
Review: Approve I go ahead and merge this now. I did review, but it is super hard to spot mistakes in a refactoring like this. We will hear of bugs sooner or later. The remaining wl_const use is tracked in bug 1348795. Thanks Ferdinand and Gun for taking care of this massive refactoring! Quite

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1343302_codecheck into lp:widelands

2014-07-25 Thread GunChleoc
I merged trunk in the other branch, so if you could merge that first, I can then take care of any remaining conflicts. I made the mistake of first splitting off this branch and then merging trunk into the other -- https://code.launchpad.net/~widelands-dev/widelands/bug-1343302_codecheck/+merge/

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

2014-07-25 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1343302_codecheck into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1343302_codecheck/+merge/228357 -- https://code.launchpad.net/~widelands-

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1343302_codecheck into lp:widelands

2014-07-25 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1343302_codecheck/+merge/228357 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343302_codecheck. ___ Mailing list: https://launchpad.n

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

2014-07-25 Thread GunChleoc
Guess who forgot to push :P -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081. ___ Mailing list: https://launchpad.net/~widela

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

2014-07-25 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1343302 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1343302/+merge/227432 -- https://code.launchpad.net/~widelands-dev/widelands/bug-13

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

2014-07-25 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1343302/+merge/227432 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343302. ___ Mailing list: https://launchpad.net/~widelands-dev Po

Re: [Widelands-dev] Fwd: can find any more resources

2014-07-25 Thread Tibor Bamhor
Hi, In the meantime I looked into particular cc file (I dont remember which one) and in AI I implemented basically the same procedure - AI counts current and starting amount of resources within radius around a mine and calculate the % of exhaustion. Seems it works fine. Also it would be usefull

Re: [Widelands-dev] Fwd: can find any more resources

2014-07-25 Thread Holger Rapp
On 25.07.2014, at 00:04, Tibor Bamhor wrote: > well, after some investigation in code it seems that mine is able to mine > some % of resources within some radius. Obviously it does not mine resources > evenly across fields, so to check one (even central) field is not enough. You could randomi

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

2014-07-25 Thread SirVer
Review: Needs Fixing This needs trunk merging really bad. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1341081. ___ Mailing list

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

2014-07-25 Thread SirVer
I fixed pathfield.cc and removed container_iterate_const. wl_range is still used, but as far as I can see only in places that can just use a for (const T& blub : container) {} loop. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is

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

2014-07-25 Thread GunChleoc
Let's use "Charcoal Burner" for the worker and "Charcoal Kiln" for the building then - with the capital letters like that. English Speakers Like Their Title Case :P -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is requested to review

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

2014-07-25 Thread GunChleoc
Almost done - we need somebody to figure out the problem in logic/pathfield.cc, and when that one's gone we can delete container_iterate_const and wl_const_range from deprecated.h. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is

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

2014-07-25 Thread GunChleoc
> The problem in building.cc was the constness of the string. Actually, it wasn't but I solved it anyway :) We have a problem with a crash in pathfield-cc, so I reverted the new code. I had a go at it, but can't get it to work. Here's one of my attempts: for (boost::shared_ptr pathfield

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

2014-07-25 Thread cghislai
I merged your branch and updated textarea, editbox and multilineeditbox, with various fixes. -- https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1.

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

2014-07-25 Thread GunChleoc
Review: Resubmit I have moved the codecheck rule into a new branch, so we can get this code in faster. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1343302/+merge/227432 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343302. __

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

2014-07-25 Thread GunChleoc
Thanks for your help! With a look at your code, I should be able to fix them all except for lua_map.cc The problem in building.cc was the constness of the string. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1203629/+merge/228203 Your team Widelands Developers is requested to revie

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

2014-07-25 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1345663 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1345663 in widelands: "format_help.lua has no Textdomain" https://bugs.launchpad.net/widelands/+bug/1345663 For more details,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1341674_codecheck into lp:widelands

2014-07-25 Thread GunChleoc
I think this is done now - except for 1 empty TODO comment that I left around. Maybe someone else will know why there's a TODO there: src/io/filesystem/zip_filesystem.cc:563: Use "TODO(username): ". Do not add empty TODO comments. I have also made the feedback individual to each case, so the us