[Widelands-dev] [Merge] lp:~hjd/widelands/bug1201330 into lp:widelands

2013-07-15 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/bug1201330 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1201330 in widelands: "Dangerous variable-length array (VLA) declaration in map_generator.cc" https://bugs.launchpad.net/wid

[Widelands-dev] Construction sites

2013-07-15 Thread Teppo Maenpaa
On Sun, Jul 14, 2013 at 09:53:25PM -, cghislai wrote: Related bugs: Bug #580905 in widelands: "write building status in a different font color for construction sites" https://bugs.launchpad.net/widelands/+bug/580905 Hi, I have been thinking of making a change regarding the construction

Re: [Widelands-dev] Construction sites

2013-07-15 Thread Charles Ghislain
Hi, > Everybody: Would such change be useful, if I have time to do that? Yep why not. I would rather go for dark yellow (current state in the branch) or dark green if wares are found, dark red if some are missing. > Charly: Would that conflict with your improvements? Yes and no. I reverted the l

[Widelands-dev] [Merge] lp:~hjd/widelands/bug1201330 into lp:widelands

2013-07-15 Thread noreply
The proposal to merge lp:~hjd/widelands/bug1201330 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~hjd/widelands/bug1201330/+merge/174737 -- https://code.launchpad.net/~hjd/widelands/bug1201330/+merge/174737 Your team Wid

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

2013-07-15 Thread Nasenbaer
Review: Needs Information I am between "Approve" and "Needs fixing" therefore I set it "Needs information" "Approve", because the patch is fine as it is and if you (and nobody else) want to do the job described below, we can just merge it as it is "Needs fixing" because as we change the "skipp

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

2013-07-15 Thread cghislai
cghislai has proposed merging lp:~widelands-dev/widelands/bug1201398 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1201398 in widelands: "Save game claims win condition is Scenario, even when it isn't" https://bugs.launchpad.net/widelands/+bu

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

2013-07-15 Thread cghislai
The proposal to merge lp:~widelands-dev/widelands/bug1201398 into lp:widelands has been updated. Description changed to: This corrects a few things with my previous save dialog changes. Thanks hjd for pointing it out, there was a few other issues. A new field in game has been created to remembe

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

2013-07-15 Thread cghislai
I knew it would be spotted :) sed is not smarted than its user... ill fix that -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug988870 into lp:widelands. _

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

2013-07-15 Thread Nasenbaer
Review: Approve Oh me... I hope I was the first who found my own error ;) Of course return=skipped unless economy needs coal or not economy needs bread return=skipped unless economy needs coal or not economy needs smoked_fish equals return=skipped unless economy needs coal or not economy needs b

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

2013-07-15 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug988870 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639 -- https://code.launchpad.net/~widelands-dev/widelands/bug988870/

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

2013-07-15 Thread cghislai
Ah, you merged already I am pretty sure that it IS equal, but anyway in the last commit I put a when condition, as its more readable. The best imho would be to put the 3 lines separatelty and only and complex conditions if it is really needed. -- https://code.launchpad.net/~widelands-dev/widelan

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

2013-07-15 Thread Nasenbaer
well it is not equal because: * take the case where coal is needed, but at least the economy needs smoked_fish (bread does not matter in that case) return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal return=skipped unless not economy needs smoked_fish -

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

2013-07-15 Thread Nasenbaer
I go to bed... worked to long ;) the FIRST is of course return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal return=skipped unless economy needs coal or not economy needs smoked_fish -> no skip because of coal -- https://code.launchpad.net/~widelands-de

Re: [Widelands-dev] Construction sites

2013-07-15 Thread Holger Rapp
On 15.07.2013, at 15:52, Teppo Maenpaa wrote: > On Sun, Jul 14, 2013 at 09:53:25PM -, cghislai wrote: > >> Related bugs: >> Bug #580905 in widelands: "write building status in a different font color >> for construction sites" >> https://bugs.launchpad.net/widelands/+bug/580905 > > Hi, >

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

2013-07-15 Thread Tino
Review: Needs Fixing Ok, got it to compile with mingw, but it does not work on windows: Widelands starts fine but as soon as i click to proceed to the main menu Widelands just closes. No output into stderr.txt and stdout.txt just ends after the graphics initialization part -- https://code.launc

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

2013-07-15 Thread SirVer
Thanks for the testing - I'll review the branch again and try to figure out what is wrong. That it crashes this early for you is an indication that something very basic is wrong. Maybe valgrind can help me out. -- https://code.launchpad.net/~widelands-dev/widelands/graphic_resetting/+merge/15998

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

2013-07-15 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/graphic_resetting into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/graphic_resetting/+merge/159985 -- https://code.launchpad.net/~wideland

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

2013-07-15 Thread SirVer
Review: Needs Fixing Couple of small comments in the code. search for NOCOM as before. -- https://code.launchpad.net/~widelands-dev/widelands/bug1201398/+merge/174809 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1201398. _

Re: [Widelands-dev] Construction sites

2013-07-15 Thread Teppo Maenpaa
On Mon, Jul 15, 2013 at 08:34:35PM +0200, Holger Rapp wrote: I like the suggestion - however I am a bit concerned how this can be explained to the user. So if you implement this, you will also need to implement a mouse over text of some sort or a status image inside the constructionsite window