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

2015-06-29 Thread SirVer
I pushed a fix in r7480. The regression test suite is still broken - some geologist test fails. But I believe this to be unrelated to this change. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1454371/+merge/261375 Your team Widelands Developers is requested to review the proposed m

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/developers_list into lp:widelands-website

2015-07-04 Thread SirVer
Review: Approve Looks good, gonna merge. -- https://code.launchpad.net/~franku/widelands-website/developers_list/+merge/259041 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widela

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/correct_image_paths into lp:widelands-website

2015-07-04 Thread SirVer
Review: Approve Merged. -- https://code.launchpad.net/~franku/widelands-website/correct_image_paths/+merge/254990 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Post t

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands-website

2015-07-04 Thread SirVer
Merged! Thanks. -- https://code.launchpad.net/~franku/widelands-website/admin_action_correct_image_path/+merge/254993 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands-website. _

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands-website

2015-07-05 Thread SirVer
I forgot: Thanks for fixing the image paths :) -- https://code.launchpad.net/~franku/widelands-website/admin_action_correct_image_path/+merge/254993 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/admin_action_correct_image_path into lp:wi

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands-website

2015-07-05 Thread SirVer
sure, I will. less code is always best. -- https://code.launchpad.net/~franku/widelands-website/admin_action_correct_image_path/+merge/254993 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/admin_action_correct_image_path into lp:widelands

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/handle_great_images into lp:widelands-website

2015-07-12 Thread SirVer
kaputtnik, are all of the prerequisites of this branch now met? Can we merge this? -- https://code.launchpad.net/~franku/widelands-website/handle_great_images/+merge/254988 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/handle_great_image

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/handle_great_images into lp:widelands-website

2015-07-15 Thread SirVer
Merged!!! Thanks for your hard work! -- https://code.launchpad.net/~franku/widelands-website/handle_great_images/+merge/254988 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/handle_great_images into lp:widelands-website. _

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

2015-07-27 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/authors_and_languages/+merge/265892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/authors_and_languages. ___ Mailing list: https://launchpad.n

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

2015-07-27 Thread SirVer
Review: Needs Fixing couple of nits not related to your changes. But while you are digging through the code Diff comments: > === modified file 'src/ui_basic/slider.cc' > --- src/ui_basic/slider.cc2014-11-27 12:02:08 + > +++ src/ui_basic/slider.cc2015-07-27 07:23:23 + > @@ -1

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

2015-07-27 Thread SirVer
Review: Approve Gonna merge. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/265906 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~wi

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

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

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

2015-07-27 Thread SirVer
Review: Needs Information I am unsure about this change now. Most UI elements are owned by their parents. Why did we need the delete before in the first place? More comments inlined. Diff comments: > > === modified file 'src/wui/attack_box.cc' > --- src/wui/attack_box.cc 2015-03-30 08:45:0

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

2015-07-27 Thread SirVer
Review: Needs Fixing Only reviewed the code that I did not write. Some comments inlined. Diff comments: > > === modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc' > --- src/editor/ui_menus/editor_main_menu_random_map.cc2014-11-30 > 18:49:38 + > +++ src/editor/ui_men

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

2015-07-29 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-653308/+merge/265931 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-653308. ___ Mailing list: https://launchpad.net/~widelands-dev Post

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

2015-07-29 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/authors_and_languages/+merge/265892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/authors_and_languages. ___ Mailing list: https://launchpad.n

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

2015-07-29 Thread SirVer
Review: Approve the nocom needs to stay, otherwise lgtm. Diff comments: > === modified file 'src/graphic/gl/system_headers.h' > --- src/graphic/gl/system_headers.h 2015-03-01 09:21:20 + > +++ src/graphic/gl/system_headers.h 2015-07-28 07:15:08 + > @@ -38,6 +38,7 @@ > #ifdef USE_GLBI

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/devs_and_locales_list into lp:widelands-website

2015-07-29 Thread SirVer
I personally always run pyformat[1] over the code. It changes the ticks to be consistent. Unfortunately, PEP8 is remarkably ugly, but that is what the python folks like. [1] https://pypi.python.org/pypi/pyformat -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merg

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/devs_and_locales_list into lp:widelands-website

2015-07-29 Thread SirVer
Review: Approve Code looks good. When should I merge this? -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/stock-policy-icons into lp:widelands

2015-07-31 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/stock-policy-icons/+merge/266518 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/stock-policy-icons. ___ Mailing list: https://launchpad.net/~wi

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/devs_and_locales_list into lp:widelands-website

2015-07-31 Thread SirVer
Merged and deployed together with the Widelands change. Thanks. -- https://code.launchpad.net/~franku/widelands-website/devs_and_locales_list/+merge/266025 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: ht

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

2015-07-31 Thread SirVer
Merged and deployed with the website change. -- https://code.launchpad.net/~widelands-dev/widelands/authors_and_languages/+merge/265892 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/authors_and_languages. ___ Mailin

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

2015-08-03 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1375579/+merge/266060 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1375579. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2015-08-03 Thread SirVer
Review: Approve I reviewed offline and merged right after. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing l

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/handle_big_images into lp:widelands-website

2015-08-06 Thread SirVer
Yes, you could. Everything is merged into trunk IMHO. However it is normal to leave merge branches around for posteriority and to understand the history of the project better. Where does it bother you? If you set it's status to "merged" it will no longer be listed in most listings. -- https://c

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

2015-08-09 Thread SirVer
Review: Approve One nit. Diff comments: > > === modified file 'src/editor/ui_menus/editor_player_menu.cc' > --- src/editor/ui_menus/editor_player_menu.cc 2015-07-29 07:26:48 + > +++ src/editor/ui_menus/editor_player_menu.cc 2015-08-06 17:33:02 + > @@ -295,7 +295,7 @@ > //

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

2015-08-10 Thread SirVer
Review: Approve lgtm, but not tested clang compilation. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1480937/+merge/267587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480937. ___ Mailing list:

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

2015-08-23 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1487239/+merge/268809 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1487239. ___ Mailing list: https://launchpad.net/~widelands-d

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

2015-08-23 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling/+merge/266626 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling. ___ Mailing list: https://launchpad.net/~wid

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-building-necessity into lp:widelands

2015-08-23 Thread SirVer
Review: Approve Not sure what this ExtendedBool is all about... But the rest lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/ai-building-necessity/+merge/268548 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai-building-necessity. ___

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/new_legal_notice_page into lp:widelands-website

2015-08-25 Thread SirVer
Can you make the list of email adresse a setting like the list of admins? -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Widelands Developers is requested to review the proposed merge of lp:~franku/widelands-website/new_legal_notice_page into

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/new_legal_notice_page into lp:widelands-website

2015-08-30 Thread SirVer
Review: Approve looks good. thanks for looking into that. I will try to merge this this week and fill in my remaining contact data. -- https://code.launchpad.net/~franku/widelands-website/new_legal_notice_page/+merge/268973 Your team Widelands Developers is subscribed to branch lp:widelands-webs

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

2015-08-30 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1463829/+merge/267779 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1463829. ___ Mailing list: https://launchpad.net/~widelands-dev Po

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-08-30 Thread SirVer
git is now rolled out on launchpad. I did not find anything about travis though - did you hjd? -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widel

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

2015-09-01 Thread SirVer
Review: Approve little hackish, but works. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1428315/+merge/269673 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1428315. ___ Mailing list: https://launc

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

2015-09-03 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1357510/+merge/265949 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1357510. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2015-09-03 Thread SirVer
Review: Approve sorry - did not see that. -- https://code.launchpad.net/~widelands-dev/widelands/find_attack_soldiers/+merge/245276 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/find_attack_soldiers. ___ Mailing li

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

2015-09-05 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270159 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2015-09-09 Thread SirVer
or a better timing information: "animate=falling once" or so. -- https://code.launchpad.net/~widelands-dev/widelands/bug1480928/+merge/270540 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1480928 into lp:widelands.

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

2015-09-09 Thread SirVer
Review: Approve Diff comments: > > === modified file 'src/ui_basic/messagebox.cc' > --- src/ui_basic/messagebox.cc2015-08-06 17:14:34 + > +++ src/ui_basic/messagebox.cc2015-09-09 18:54:54 + > @@ -20,7 +20,6 @@ > #include "ui_basic/messagebox.h" > > #include "base/i1

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

2015-09-13 Thread SirVer
Review: Approve one thing to look into, otherwise lgtm. Diff comments: > > === modified file 'tribes/atlanteans/woodcutters_house/help.lua' > --- tribes/atlanteans/woodcutters_house/help.lua 2015-07-26 10:59:28 > + > +++ tribes/atlanteans/woodcutters_house/help.lua 2015-09-13 06:

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

2015-09-20 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/271730 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2015-09-20 Thread SirVer
Yes. We used to save objects in two steps (this example is for buildings, but bobs and other stuff were the same). We had a buildings_data packet that described what buildings are where and the serial number of this building. Another packet contained 'buildings_data_data' which contained all of

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/css_changes into lp:widelands-website

2015-09-20 Thread SirVer
Review: Approve Merged and deployed! Thanks. -- https://code.launchpad.net/~franku/widelands-website/css_changes/+merge/271388 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelan

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

2015-10-06 Thread SirVer
Review: Approve lgtm -- https://code.launchpad.net/~widelands-dev/widelands/bug-1291904/+merge/237128 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1291904. ___ Mailing list: https://launchpad.net/~widelands-de

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

2015-10-06 Thread SirVer
I think that is an improvement. A better fix would be to change the m_animations vector to contain unique_ptr<> instead of raw pointers. The destructor would then not be needed. If you do not want to do that, could you add a TODO next to m_animations in the .h file? -- https://code.launchpad.n

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

2015-10-17 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1506084/+merge/274758 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1506084. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2015-10-17 Thread SirVer
Review: Approve Diff comments: > === modified file 'src/editor/ui_menus/editor_main_menu_load_or_save_map.cc' > --- src/editor/ui_menus/editor_main_menu_load_or_save_map.cc 2015-10-02 > 09:26:57 + > +++ src/editor/ui_menus/editor_main_menu_load_or_save_map.cc 2015-10-15 > 19:44:24 +

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

2015-10-17 Thread SirVer
Review: Needs Information I doubt that this works, but I did not test it. I believe that is_loaded() is true in our problem case. The cycle for loading works like this: load_game() save_game() cleanup_for_load() <-- this is the slow part load_saved_game() We do not have the problem when loadin

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

2015-10-18 Thread SirVer
Review: Approve Thanks for the explanation! I stand corrected and agree with Tibor that this is a very good fix then, minimal and easy to understand. -- https://code.launchpad.net/~widelands-dev/widelands/bug1503949/+merge/274157 Your team Widelands Developers is subscribed to branch lp:~wide

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

2015-10-25 Thread SirVer
Review: Approve Tibor, I did my own fix for this when the Mac OS X nightly didn't build in: http://bazaar.launchpad.net/~widelands-dev/widelands/trunk/revision/7570 Feel free to undo that and commit yours instead. I was not sure about the exact semantics of that function and just implemented wh

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

2015-10-25 Thread SirVer
>-Werror=return-type will treat just that warning as an error. amendment for that: that is a really good thing (TM). Because should in a release build the execution really reach the code path without a return statement, the returned value will be random. This leads to undefined behavior down th

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

2015-10-25 Thread SirVer
I am in a writing mode right now, so let me add one more thought :) Be careful with assert()s in general. Actually, ideally do not use them. They are only executed in debug builds which means that release builds can break through them without you noticing (case in point: the breakage that we had

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

2015-11-01 Thread SirVer
Still working on the review. Have another long train ride today and hope to get it done then. I'll get back to this thread then. In general I find very little to complain about in the code - really great job :) > Am 01.11.2015 um 11:01 schrieb GunChleoc : > > Some comments to the code revie

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

2015-11-01 Thread SirVer
Not yet done. I reviewed everything but src/logic/, I cannot concentrate anymore now though. I'll finish the rest tomorrow. -- https://code.launchpad.net/~widelands-dev/widelands/one_tribe/+merge/274832 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev

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

2015-11-01 Thread SirVer
[Num Glob vs list_directory] I doubt that the regex matching is the slow part, but I can understand that listing all files in the directories and then filtering the ones we are not interested in is slow. The numglob is only checking if files exist, which will be faster. But I just grepped the

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

2015-11-02 Thread SirVer
Review: Approve > Renaming "outputs" to "occupants" won't work, because this is a feature of > production sites in general and not just militarysites. Add a TODO that militarysite should not be a productionsite? Outputs is really weird for militarysites. Okay, done with the review. I added a

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

2015-11-02 Thread SirVer
Is this still current? I mean, do you still want to do this? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1397500/+merge/243860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1397500. ___ Mailing li

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

2015-11-03 Thread SirVer
> This function is used in the GameSettingsProvider classes before an egbase is > created. Is there a better design than using static for this? IMHO, yes. Pull the method out into a stand alone function. It is more modular, and less coupled (static methods can access private static members and p

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

2015-11-04 Thread SirVer
as said, other devs that are as experienced as I am disagree with this last point. So it is more bike shedding and should not be overrated. Other points are more clear cut. I suggest reading effective c++ and effective c++11 if you want to learn more about good code design - both are really exc

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

2015-11-09 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/purpose_helptexts/+merge/276931 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/purpose_helptexts. ___ Mailing list: https://launchpad.net/~wide

Re: [Widelands-dev] [Merge] lp:~franku/widelands-website/little_navi_changes into lp:widelands-website

2015-11-17 Thread SirVer
Sorry for the delay. This is deployed now. Thanks! -- https://code.launchpad.net/~franku/widelands-website/little_navi_changes/+merge/276625 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad

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

2015-11-17 Thread SirVer
Review: Approve Just two nits on the c++ part: - In editor_main_menu_save_map.cc: pull out a reference to eia().egbase() - it is used like a dozen times. - In void FullscreenMenuLaunchMPG::win_condition_update(): I suggest pulling out a function for the 'else' block to make the code more reada

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

2015-11-17 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/277693 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev

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

2015-11-17 Thread SirVer
Review: Approve -- https://code.launchpad.net/~widelands-dev/widelands/bug-1516777/+merge/277701 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1516777. ___ Mailing list: https://launchpad.net/~widelands-dev Po

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

2015-11-18 Thread SirVer
Review: Approve no more grunting spiders? forever silenced. At least they still have their milking tongs. -- https://code.launchpad.net/~widelands-dev/widelands/farm_animal_sound/+merge/277791 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/farm_animal_so

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

2015-11-22 Thread SirVer
Review: Approve I like this suggestion better too - it is how we deal with unreachable code everywhere else. An even nicer solution would be if we had an UNREACHABLE macro that does behave exactly the same in every place. It could be implemented differently for each compiler, for example for c

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

2015-11-28 Thread SirVer
Review: Needs Fixing Diff comments: > > === modified file 'utils/buildcat.py' > --- utils/buildcat.py 2015-11-06 18:57:00 + > +++ utils/buildcat.py 2015-11-27 17:43:13 + > @@ -58,8 +58,9 @@ > "../../world/*/*/*/*/*/*.lua", > ]), > ("tribes/tribes", [ > -"../.

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

2015-11-28 Thread SirVer
see inline comments -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-de

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

2015-11-28 Thread SirVer
Review: Approve lgtm. gonna merge. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.n

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

2015-11-28 Thread SirVer
Review: Approve lgtm. but I did not test it yet. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1519361/+merge/278886 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1519361. ___ Mailing list: https:/

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

2015-12-28 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/clang_warnings into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/clang_warnings/+merge/281383 Fixes some compile warnings for clang

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

2015-12-30 Thread SirVer
I am working on a buildbot for us, this is testing. @bunnybot: merge -- https://code.launchpad.net/~widelands-dev/widelands/clang_warnings/+merge/281383 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/clang_warnings. __

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

2016-01-01 Thread SirVer
Why not pull the duplication out? http://stackoverflow.com/questions/10985950/how-do-you-insert-a-template-into-another-template -- https://code.launchpad.net/~widelands-dev/widelands-website/copyrightyear_and_links/+merge/281450 Your team Widelands Developers is requested to review the proposed

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

2016-01-02 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/appveyor into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473 -- Your team Widelands Developers is requested to review the prop

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

2016-01-02 Thread SirVer
Review: Disapprove As discussed in chat, pushing a branch onto github for experimenting is a faster way to success, -- https://code.launchpad.net/~widelands-dev/widelands/appveyor/+merge/281473 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/appveyor. ___

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

2016-01-03 Thread SirVer
Review: Needs Fixing I think this is broken in the current state. The problem is that logic depends on available_supply which is a multimap. The problem is that the map is sorted by distance, then by a pointer. In a replay or in a multiplayer games, the order of elements in this map is differ

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

2016-01-03 Thread SirVer
That should work - but I would suggest to make a tiny private struct to improve readability. struct SupplyQuality { uint32 distance; uint32 serial; bool operator<(const SupplyQuality& other) const { return std::forward_as_tuple(distance, serial) < std::forward_as_tuple(other.d

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2016-01-04 Thread SirVer
seems like a transient failure. If this gets too chatty I can special case these. -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian.

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

2016-01-04 Thread SirVer
[threshold] I did not follow the discussion about the threshold though, on a quick thought I can see downsides to this approach. I suggest doing more timing analysis (with AI disabled) to figure out what actually takes time here and if there are ways of improving the situation. > I dont say tha

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

2016-01-04 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/render_queue into lp:widelands has been updated. Commit Message changed to: - Implemented a RenderQueue. All drawing operations during drawing only register an item into the queue, at the end of the frame, the RenderQueue will draw everything

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

2016-01-04 Thread SirVer
Review: Resubmit Okay, I think the road issue is now fixed. Could I get another look? -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. __

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

2016-01-04 Thread SirVer
> So I made a bit of profiling, first of all it seems the game (drawing itself) > takes quite a lot of CPU time - perhaps problem on my side? No, that is accurate. The render_queue branch makes this already better, but only a full texture_atlas will make this really fast. I picked up working on

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

2016-01-05 Thread SirVer
The graph lines are buggy and not intended that way. I will open a bug report for them when merging this branch. I'd like to get it in sooner than later though as it is pretty high maintenance to keep it updated. You have a keen eye, kaputtnik :) In fact the 'artifacts' are already in the origi

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

2016-01-05 Thread SirVer
Review: Approve code lgtm now. A couple of minor nits, feel free to merge after addressing these. Diff comments: > === modified file 'src/economy/economy.cc' > --- src/economy/economy.cc2015-11-11 09:52:55 + > +++ src/economy/economy.cc2016-01-04 18:44:46 + > @@ -664,14 +665,45

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

2016-01-05 Thread SirVer
Followup bug for the line issue: https://bugs.launchpad.net/widelands/+bug/1531114 Thanks for testing, everybody! @bunnbot merge -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/

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

2016-01-05 Thread SirVer
e is a singleton implementing the concept of deferred > +// rendering: Every rendering call that pretends to draw onto the screen will > +// instead enqueue an item into the RenderQueue. The Graphic::refresh() will > +// then setup OpenGL to render onto the screen and then call > +// RenderQueue::

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

2016-01-05 Thread SirVer
The buildhelp is also broken in trunk, so not the fault of this branch. Please test, so we can get it merged. -- https://code.launchpad.net/~widelands-dev/widelands/render_queue/+merge/250524 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/render_queue. __

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

2016-01-05 Thread SirVer
SirVer has proposed merging lp:~widelands-dev/widelands/fix_overlays into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_overlays/+merge/281641 Fixes the buildhelp. -- Your team Widelands

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

2016-01-05 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/fix_overlays into lp:widelands has been updated. Commit Message changed to: Fixes the display of the buildhelp. This got broken in r7688 by changing the callback function of the OverlayManager to return a bool instead of a NodeCap. For more de

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

2016-01-05 Thread SirVer
Tibor, sure, go ahead and merge. > I looked at other examples f.e. here: > http://bazaar.launchpad.net/~widelands-dev/widelands/request_supply_opt/view/head:/src/economy/supply.h#L94 > and everywhere it is done this way. Ah, that is a philosophical question, really. Does local style trump glob

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

2016-01-05 Thread SirVer
Review: Approve Very straightforward fix. I like it. I am in no position to test right now, but since this is fixing a crashing bug and the diff is tiny, I'll merge it right now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1530999/+merge/281691 Your team Wideland

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

2016-01-07 Thread SirVer
Great achievement. Is there an API so that bunnybot can check for the appveyor build state too? (I can search for it myself, but maybe you already know where it is). One inline comment with food for thought. Diff comments: > > === modified file 'utils/detect_revision.py' > --- utils/detect_rev

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

2016-01-07 Thread SirVer
Review: Approve there are still NOCOM in the diff which need removing, otherwise lgtm. Diff comments: > === modified file 'src/economy/economy.cc' > --- src/economy/economy.cc2015-11-11 09:52:55 + > +++ src/economy/economy.cc2016-01-06 20:05:29 + > @@ -664,14 +665,42 @@ > R

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

2016-01-07 Thread SirVer
> Tho code look good, sorry for introducing this bug. no worries, changing code introduces bugs, that is the way of life. > I think water is just there or not, and it doesn't deplete - we only have 1 > resource indicator for it too. that is not correct. Water is not handled special in any way i

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

2016-01-07 Thread SirVer
The proposal to merge lp:~widelands-dev/widelands/full_texture_atlas into lp:widelands has been updated. Commit Message changed to: - Support maximum dimensions when baking texture atlases. - Change wl_make_texture_atlas to build a full texture atlas for all images in the game. For more detail

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

2016-01-07 Thread SirVer
Update: If you want te test the usage of the texture atlas in game, use this branch: https://code.launchpad.net/~widelands-dev/widelands/use_image_cache After you generated the texture atlas, you have to move the files into a directory called cache: $ build/src/graphic/wl_make_texture_atlas 819

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

2016-01-08 Thread SirVer
> Isn't it possible to exclude a folder with images from being included into > the atlas? yes. in fact, big pictures are already not included into the atlas, so there will still be a few standalone textures. > Of course these pics are all very smal... So they do not really matter that much any

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

2016-01-08 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/logic_directory_layout/+merge/280354 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/logic_directory_layout. ___ Mailing list: https://lau

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

2016-01-08 Thread SirVer
Review: Approve some nits. Not sure how to test this though. Diff comments: > === modified file 'src/graphic/text/bidi.cc' > --- src/graphic/text/bidi.cc 2015-10-12 12:11:58 + > +++ src/graphic/text/bidi.cc 2016-01-06 12:13:29 + > @@ -555,11 +555,12 @@ > namespace i18n { > > > -//

<    4   5   6   7   8   9   10   11   12   13   >