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

2014-07-23 Thread wl-zocker
Are you sure that "furnace" is the right term? From what I see, it seems to describe what we call smelting works (that is at least what a quick look in http://en.wikipedia.org/wiki/Charcoal reveals). Furthermore, "charcoal furnace" (with quotation mark) has only 36,100 hit on Google, while "char

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

2014-07-23 Thread GunChleoc
Review: Resubmit Fixed up the Doxygen comments, so this is good to go. I'll have a separate beanch for the code check rule. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341674/+merge/227693 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-134

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

2014-07-23 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1341674_codecheck into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1341674 in widelands: "Consolidate TODO FIXME BUG to one style." https://bugs.launchpad.net/widelands/+bug/1341674

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

2014-07-23 Thread GunChleoc
OK, next try, but I need somebody to help me hunt down a segfault. I have described the problem in my commit message http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1341081/revision/7121 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1341081/+merge/227107 Your team Widelands

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

2014-07-23 Thread GunChleoc
Done except for removing the name/descname wrappers in L_Map_Object. I opened a new bug for that one, because it's a bigger change. Regarding the spritesheet thing, maybe we can sole this with a new richtext tag that can take a general Image and then use filename + coordinates to get the image

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

2014-07-23 Thread Tibor Bamhor
GunChleoc, it failed to compile here: [ 82%] Building CXX object src/map_io/CMakeFiles/map_io.dir/widelands_map_object_packet.cc.o In file included from /var/widelands/BZR/bug-1341081/bug-1341081/src/map_io/widelands_map_object_packet.cc:22:0: /var/widelands/BZR/bug-1341081/bug-1341081/src/map_

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

2014-07-23 Thread GunChleoc
To unify the, we could all call them "Charcoal Burner's House". I did some digging online and there doesn't seem to be an easy English term for the German "Köhlerei" at all. You can have a pit or a stack, but what you see in-game is a house: What about "kiln"? http://www.charcoalburners.co.uk/c

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

2014-07-23 Thread Hans Joachim Desserud
> Some maps talk about not containing much coal and advise to build charcoal > burners in their description. I do not know if such maps are shipped with > Widelands though. The plateau was the only map I found which mentioned "burner" in any way. >The translation table in our wiki. While I did

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

2014-07-23 Thread wl-zocker
None of the proposed options really convinces me. I do not like "kiln" because we already have a "lime kiln". As it stands, I prefer renaming all three to "Charcoal Burner's House". -- https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810 Your team Widelands Developers is req

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

2014-07-23 Thread SirVer
Barbarians do not build houses. I understand that there is movement to unify names, but please also keep the in mind that the three tribes should be different and should have their own individuality. aD, I added you as a reviewer since your a native speaker. Can you add anything to the discussi

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

2014-07-23 Thread SirVer
Review: Approve I merged this now, but removed the TODO discussion around spritesheets. I think it can be handled transparently - .menu can return a hash of an image in the image cache. Since the renderer uses the image cache for looking up it's images, this should be opaque for the renderer. T

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

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

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

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

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

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

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

2014-07-23 Thread SirVer
Review: Needs Fixing Diff comments: > === added file 'cmake/codecheck/rules/format_TODO_comments' > --- cmake/codecheck/rules/format_TODO_comments1970-01-01 00:00:00 > + > +++ cmake/codecheck/rules/format_TODO_comments2014-07-23 14:52:16 > + > @@ -0,0 +1,21 @@ > +#!/us