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

2016-05-17 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list:

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

2016-05-17 Thread Miroslav Remák
Review: Approve code, testing Changes LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/map_object_info. ___ Mailing list:

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

2016-05-16 Thread Miroslav Remák
Review: Needs Fixing code, running Review in the diff comments. JSON seems to be generated properly, but I don't have the website set up, so I am unable to test with your other branch there. Diff comments: > > === modified file 'src/CMakeLists.txt' > --- src/CMakeLists.txt2016-02-06

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

2016-05-15 Thread Miroslav Remák
For me it shows a different save path than where the map is actually saved: /widelands_working_dir/maps/My_Maps/map.wmf instead of /home/user/.widelands/maps/My_Maps/map.wmf. I guess that's because canonicalize_name does not take file system layers into account. --

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

2016-05-15 Thread Miroslav Remák
> I recommend that we wait with merging this when we get close to the release > candidate, because we now have extra linking time with each compile. How about a CMake option for compiling website-related tools? -- https://code.launchpad.net/~widelands-dev/widelands/map_object_info/+merge/287409

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

2016-05-14 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/fix_tut1_destroy_quarries_2 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries_2/+merge/294713

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

2016-05-14 Thread Miroslav Remák
Umm, this kinda invalidates the following message box talking about having received multiple messages. Also, I think a much better fix would be to count messages tied to fields first_quarry_field and second_quarry_field. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-random-map-id into lp:widelands

2016-05-11 Thread Miroslav Remák
Review: Approve code, testing LGTM. Just one little nitpick (sorry, couldn't help it!): map_info.landRatio etc. are not percentages. Displaying these numbers alongside a percent sign denotes an entirely different ratio. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-11 Thread Miroslav Remák
I have also done some limited testing using the 'report_result' Lua function and I can confirm that the end statues are saved and loaded correctly. Win conditions should also work properly since they make use of this function. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-11 Thread Miroslav Remák
Review: Approve code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1302593-result-screen/+merge/293521 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1302593-result-screen. ___ Mailing list:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-11 Thread Miroslav Remák
Review: Needs Fixing code Review. Diff comments: > === modified file 'src/game_io/game_player_info_packet.cc' > --- src/game_io/game_player_info_packet.cc2016-02-16 10:27:23 + > +++ src/game_io/game_player_info_packet.cc2016-05-11 06:51:52 + > @@ -72,6 +73,21 @@ >

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread Miroslav Remák
Well, it does nothing useful in the original code, so it is redundant. It modifies a copy of the element (not the actual element!) that is destroyed immediately after. That said, when I wrote the comment, it did not occur to me you were trying to modify the vector's element - I thought it was

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread Miroslav Remák
Extended reply. Diff comments: > > === modified file 'src/logic/playersmanager.cc' > --- src/logic/playersmanager.cc 2016-02-16 10:27:23 + > +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 + > @@ -120,5 +120,21 @@ > } > } > > +void

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-10 Thread Miroslav Remák
Replied to the question in the diff comments. Diff comments: > > === modified file 'src/logic/playersmanager.cc' > --- src/logic/playersmanager.cc 2016-02-16 10:27:23 + > +++ src/logic/playersmanager.cc 2016-05-02 11:22:37 + > @@ -120,5 +120,21 @@ > } > } > > +void

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

2016-05-09 Thread Miroslav Remák
I am not familiar with the AI code, but I think there is no need for heap allocation (i.e. using the operator new). It should be enough to allocate 'path' on the stack like so: Path path; That way it will be destroyed automatically once it goes out of scope. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-09 Thread Miroslav Remák
> I get an empty scripting subdir: I can't reproduce the issue you are having with the provided steps - tried on Linux and Windows, with and without zipping enabled. > With no-zipping enabled at this point i get an error, that the map cannot be > saved because the map dir itself cannot removed.

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

2016-05-08 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1579500-broken_territorial_time into lp:widelands. Commit message: Fix Lua errors and messages not displaying correctly in Territorial Time Requested reviews: Widelands Developers (widelands-dev) For more details, see

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-08 Thread Miroslav Remák
> Have you tested that the contents of the "scripts" directory don't get wiped? You mean the map's "scripting" directory? MapScriptingPacket::write seems to take care of preserving it. The map FS object is still intact when this method is called. I've tried to save a couple of scenarios and

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-07 Thread Miroslav Remák
The proposal to merge lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands has been updated. Description changed to: Destroy the map file system while saving the map. This will make sure that the .wmf file is unlocked on Windows. Tested on Windows 7 VM. For more

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands

2016-05-07 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1548932-editor-save-zip-2 into lp:widelands. Commit message: Fix failure to overwrite currently loaded map on Windows Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-601398-map-location-markers into lp:widelands

2016-05-06 Thread Miroslav Remák
Review: Approve code, testing LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-601398-map-location-markers/+merge/293983 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-601398-map-location-markers.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/revise-map-descr into lp:widelands

2016-05-05 Thread Miroslav Remák
Review: Approve code Codecheck complains: src/wui/mapdetails.cc:153: Line is too long! Keep it < 110 chars (with tab width of 3) LGTM otherwise. -- https://code.launchpad.net/~widelands-dev/widelands/revise-map-descr/+merge/292031 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1302593-result-screen into lp:widelands

2016-05-05 Thread Miroslav Remák
Review: Needs Fixing code, testing See diff comments. Diff comments: > === modified file 'src/game_io/game_player_info_packet.cc' > --- src/game_io/game_player_info_packet.cc2016-02-16 10:27:23 + > +++ src/game_io/game_player_info_packet.cc2016-05-02 11:22:37 + > @@ -72,6 +73,19

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands

2016-05-05 Thread Miroslav Remák
Review: Approve code, testing LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/barbarians2-starting-objective/+merge/293546 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/barbarians2-starting-objective.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1573968-new-map-crash into lp:widelands

2016-05-02 Thread Miroslav Remák
I think selecting info tool in EditorInteractive::cleanup_for_load is unnecessary and does not fix the problem at its root. I propose: - changing 'current_player_ = 0;' to 'current_player_ = 1;' in EditorSetStartingPosTool's constructor - replacing 'select_tool(tools()->info,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1576280-help-textdomains into lp:widelands

2016-05-02 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1576280-help-textdomains/+merge/293479 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1576280-help-textdomains. ___ Mailing list:

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

2016-05-02 Thread Miroslav Remák
The proposal to merge lp:~widelands-dev/widelands/bug-1535732-testfix into lp:widelands has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-testfix/+merge/292734 -- Your team Widelands Developers is

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

2016-05-02 Thread Miroslav Remák
Replied to a diff comment. Diff comments: > > === modified file 'src/map_io/map_players_view_packet.cc' > --- src/map_io/map_players_view_packet.cc 2016-02-16 10:27:23 + > +++ src/map_io/map_players_view_packet.cc 2016-05-01 10:05:57 + > @@ -991,12 +991,12 @@ >

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

2016-05-01 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1572879-broken_bidi into lp:widelands. Commit message: Specify encoding of icu::UnicodeString input Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1572879 in widelands: "Font selection and

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

2016-04-24 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1535732-testfix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1535732 in widelands: "Texts not displayed correctly with the new font renderer" https://bugs.lau

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535732-font-textures into lp:widelands

2016-04-24 Thread Miroslav Remák
No way this change fixes anything. It must be a coincidence that the problem went away for you. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535732-font-textures/+merge/292354 Your team Widelands Developers is subscribed to branch

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

2016-04-23 Thread Miroslav Remák
I don't like the inconsistency between kMarginX and margin_y; kMarginX defines left margin as well as right margin, while margin_y is top margin and bottom margin combined. So I took the liberty of fixing this inconsistency. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1565429-client-version into lp:widelands

2016-04-22 Thread Miroslav Remák
Review: Approve code, testing LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1565429-client-version/+merge/292476 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1565429-client-version. ___

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

2016-04-22 Thread Miroslav Remák
I forgot to mention that the linked bug is not reproducible on all resolutions. Try changing your resolution to 1024x768 to reproduce the crash. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1571308-editbox_crash/+merge/292591 Your team Widelands Developers is requested to review

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

2016-04-21 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1571308-editbox_crash into lp:widelands. Commit message: Fix height and text displacement issues in EditBox Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1571308 in widelands: "Crash

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1571308-fh1-texture-size into lp:widelands

2016-04-20 Thread Miroslav Remák
Review: Approve code Code LGTM. However, this deals with another issue and does not fix bug 1571308 (the crash is still present). Please don't mark the bug as resolved after merging this. If you are interested in fixing the actual bug, please read this comment, which should hopefully clear

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

2016-04-17 Thread Miroslav Remák
> The Lua functions always return an int, that's how the interface works. Sure, but why are you bringing this up? Has anyone said otherwise? -- https://code.launchpad.net/~widelands-dev/widelands/bug_1571009_work_area_radius/+merge/292066 Your team Widelands Developers is requested to review the

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

2016-04-17 Thread Miroslav Remák
Diff. Diff comments: > > === modified file 'src/scripting/lua_map.cc' > --- src/scripting/lua_map.cc 2016-04-11 06:45:29 + > +++ src/scripting/lua_map.cc 2016-04-17 06:41:21 + > @@ -1871,10 +1871,16 @@ > /* RST > .. attribute:: workarea_radius > > - (RO)

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

2016-04-16 Thread Miroslav Remák
Diff reply. Diff comments: > > === modified file 'src/scripting/lua_map.cc' > --- src/scripting/lua_map.cc 2016-04-11 06:45:29 + > +++ src/scripting/lua_map.cc 2016-04-16 12:42:55 + > @@ -1871,10 +1871,16 @@ > /* RST > .. attribute:: workarea_radius > > -

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

2016-04-16 Thread Miroslav Remák
See diff comments. Diff comments: > > === modified file 'src/scripting/lua_map.cc' > --- src/scripting/lua_map.cc 2016-04-11 06:45:29 + > +++ src/scripting/lua_map.cc 2016-04-16 12:42:55 + > @@ -1871,10 +1871,16 @@ > /* RST > .. attribute:: workarea_radius > > -

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

2016-04-15 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/test-ngettext/+merge/291587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/test-ngettext. ___ Mailing list:

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

2016-04-14 Thread Miroslav Remák
Ok, sounds good to me. -- https://code.launchpad.net/~widelands-dev/widelands/test-ngettext/+merge/291587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/test-ngettext. ___ Mailing list:

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

2016-04-14 Thread Miroslav Remák
I fully agree with GunChleoc regarding Klaus' post. In Slovak we would say "twenty-five whole (ones) (and) six tenths of a second" and write "25,6 sekundy", where "sekundy" is the genitive case form of the word second. That's why a special plural form is needed. As for the merge request, I

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

2016-04-13 Thread Miroslav Remák
> Floating point numbers can also become integers I don't see how that is relevant, what's it in response to? -- https://code.launchpad.net/~widelands-dev/widelands/test-ngettext/+merge/291587 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/test-ngettext.

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

2016-04-12 Thread Miroslav Remák
> Maybe we could write a wrapper that will map floating point numbers to the > appropriate integer numbers for the languages in our list, and then use those > integers to call ngettext? That wouldn't work for Slovak, because floats need their own, different form. There is nothing to map to. >

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

2016-04-12 Thread Miroslav Remák
According to the gettext manual, "a simple gettext call with a form suitable for all values will do"[1] -- something like http://pastebin.com/raw/R2tGW9XH. The CLDR tables[2] clearly disprove this rule being universal, though. Flooring produces incorrect results for Slovak and I bet a lot of

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

2016-04-12 Thread Miroslav Remák
I'm not a fan of flooring the number in our C++ code. Passing a non-integer value to ngettext from Lua should result in an error (no idea what crashes you're talking about), IMO. Where do we need to pass floats? -- https://code.launchpad.net/~widelands-dev/widelands/test-ngettext/+merge/291587

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

2016-04-10 Thread Miroslav Remák
Review: Approve code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1543001-eris. ___ Mailing list:

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

2016-04-10 Thread Miroslav Remák
When a coroutine errors, an in-game message is supposed to be sent to all of the players: http://bazaar.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/view/head:/src/logic/cmd_luacoroutine.cc#L51 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your

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

2016-04-10 Thread Miroslav Remák
Can you also fix the issue I mentioned here: https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294/comments/746462 This is what lead to the crash in the first place... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team

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

2016-04-09 Thread Miroslav Remák
Right, I see. We should definitely up the MapScriptingPacket version. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1543001-eris.

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

2016-04-09 Thread Miroslav Remák
@kaputtnik: You won't be able to load older savegames because the save format of Eris is not compatible. I'm not sure if we can catch the error and display a message box instead of aborting, though. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team

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

2016-04-09 Thread Miroslav Remák
Also, what does 'print(_VERSION)' output on your end? It should be 'Lua+Eris 5.3'. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1543001-eris into

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

2016-04-09 Thread Miroslav Remák
My in-game resolution is 1024x768, 60 fps. It happens anytime the view or mouse pointer moves automatically (see diff). For example, the first tutorial mission errors just after activating build spaces. Can you try running 'wl.ui.MapView().viewpoint_x = 2.5' via the script console to see if

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

2016-04-08 Thread Miroslav Remák
SirVer is correct. Here's an explanation: https://github.com/fnuecke/eris/tree/master-lua5.3#core-library You don't need to have Lua installed on your system at all. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is requested

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1512151-load-small-map into lp:widelands

2016-04-08 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1512151-load-small-map/+merge/290802 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1512151-load-small-map. ___ Mailing list:

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

2016-04-08 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list:

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

2016-04-07 Thread Miroslav Remák
We're going to break savegame compatibility for this release anyway. What's holding us from updating to Lua 5.3 eris? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1543001-eris/+merge/291294 Your team Widelands Developers is requested to review the proposed merge of

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

2016-04-07 Thread Miroslav Remák
See diff comments, otherwise LGTM. Diff comments: > > === modified file 'src/editor/ui_menus/tool_change_height_options_menu.h' > --- src/editor/ui_menus/tool_change_height_options_menu.h 2016-04-06 > 09:23:04 + > +++ src/editor/ui_menus/tool_change_height_options_menu.h 2016-04-07

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

2016-04-07 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list:

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

2016-04-06 Thread Miroslav Remák
Sounds good. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1395322-tool3. ___ Mailing list:

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

2016-04-06 Thread Miroslav Remák
It's used as a fallback to the first alternative version of the tool if the second one is not available. It makes sense to me, but I'm not against changing this behavior. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1395322-tool3/+merge/290829 Your team Widelands Developers is

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

2016-04-05 Thread Miroslav Remák
If we're going to be so specific, we should also mention that Shift or Ctrl + Click removes map elements for Immovables, Animals and Port Space tools. Except Ctrl + Click with the Port Space tool does placement instead of removal for some reason. Perhaps we could fix this inconsistency? That

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1526911-cursor-positioning into lp:widelands

2016-04-05 Thread Miroslav Remák
Review: Approve code Looks good code-wise. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1526911-cursor-positioning/+merge/290954 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1526911-cursor-positioning.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings into lp:widelands

2016-04-04 Thread Miroslav Remák
Review: Approve code review + testing LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings/+merge/290895 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1538549-dismantle-enemy-buildings.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
I don't have any experience with automatic formatting tools besides auto-indent in my IDE. I was suggesting doing it manually for these few lines (the rest is OK), but it can be done later. I think you can go ahead and merge it as it is then. --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
The constructor would probably need prettifying as well. -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
Fine with me. Could you also fix the inconsistent indentation of that lambda? -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-04 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/chat-messages-overlap/+merge/290834 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/chat-messages-overlap. ___ Mailing list:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/chat-messages-overlap into lp:widelands

2016-04-03 Thread Miroslav Remák
Review: Needs Fixing Change the height here as well, so it doesn't shift back down on resolution change: graphic_resolution_changed_subscriber_ = Notifications::subscribe( [this](const GraphicResolutionChanged& message) { set_size(message.width,

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1530370-soldiers-lua into lp:widelands

2016-04-03 Thread Miroslav Remák
Review: Approve code review + testing LGTM, just a few minor typos in documentation (see diff comments). Diff comments: > > === modified file 'src/scripting/lua_map.cc' > --- src/scripting/lua_map.cc 2016-03-22 07:32:14 + > +++ src/scripting/lua_map.cc 2016-04-02 16:56:15 + > @@

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1535065-mapgen-user-feedback into lp:widelands

2016-04-03 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1535065-mapgen-user-feedback/+merge/290803 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1535065-mapgen-user-feedback. ___

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

2016-04-03 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/escaping-fixes into lp:widelands. Commit message: - Remove unnecessary code - Unescape several plaintext strings Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net

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

2016-04-02 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1562332/+merge/290794 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1562332. ___ Mailing list:

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

2016-04-01 Thread Miroslav Remák
Review: Needs Fixing You should regenerate developers.lua because it still contains translators. Also, see my diff comments. Other than that, code LGTM. Diff comments: > > === modified file 'data/txts/README.lua' > --- data/txts/README.lua 2016-01-28 05:24:34 + > +++

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/lua-driven-help into lp:widelands

2016-03-31 Thread Miroslav Remák
Fix in lp:~widelands-dev/widelands/luatable-stack-fix. -- https://code.launchpad.net/~widelands-dev/widelands/lua-driven-help/+merge/289782 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/lua-driven-help. ___ Mailing

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/luatable-stack-fix into lp:widelands

2016-03-31 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/luatable-stack-fix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/luatable-stack-fix/+merge/290650 This should fix the bug

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

2016-03-30 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/escaping-fixes into lp:widelands. Commit message: - Introduce '' entity which translates to '&' - Properly escape user messages - Fix entity replacement in the old RT renderer - Use a function for repeated code in chat_msg_layou

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

2016-03-29 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/fix_actionconfirm/+merge/290280 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fix_actionconfirm. ___ Mailing list:

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

2016-03-28 Thread Miroslav Remák
Review: Approve Hmm, my config reset after trying this branch, but I am unable to reproduce it. Most likely not related to these changes, though. Code LGTM, tested and works fine. -- https://code.launchpad.net/~widelands-dev/widelands/options_spinbox_cleanups/+merge/290192 Your team Widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1556218-escape-characters into lp:widelands

2016-03-28 Thread Miroslav Remák
Review: Approve LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1556218-escape-characters/+merge/290191 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1556218-escape-characters. ___ Mailing

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

2016-03-27 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1562071-rendering_issues into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1562071 in widelands: "Visual glitch in chat overlay" https://bugs.launchpad.net/widelands/+b

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

2016-03-24 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/infotool_stuck_painting into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/infotool_stuck_painting/+merge/290076 After using

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

2016-03-22 Thread Miroslav Remák
Yep, I can confirm that allows_seafaring() indeed does take care of that. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1559729-lost_portspace/+merge/289626 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1559729-lost_portspace.

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

2016-03-21 Thread Miroslav Remák
Btw, do you happen to know why find_portdock doesn't check ownership against the owner of the given field itself, but rather the second field to the SE of it? const FCoords start = br_n(br_n(get_fcoords(c))); const Widelands::PlayerNumber owner = start.field->get_owned_by(); --

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

2016-03-21 Thread Miroslav Remák
Yep, you're right. We should get rid of these tests in MapPortSpacesPacket::write altogether. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1559729-lost_portspace/+merge/289626 Your team Widelands Developers is requested to review the proposed merge of

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

2016-03-21 Thread Miroslav Remák
The conditions for this bug to happen (see the description of my merge request) were already met when the bug reporter made that savegame. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1559729-lost_portspace/+merge/289626 Your team Widelands Developers is requested to review the

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

2016-03-21 Thread Miroslav Remák
No, I've never said that. The port space has been removed from the savegame permanently due to a saving bug in MapPortSpacesPacket::write that this merge request fixes. You will have to start the game anew. --

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

2016-03-21 Thread Miroslav Remák
No, it's not called during normal game. Just search for any "allows_seafaring" occurrences in the code. I've tested it as well just to make sure. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1559729-lost_portspace/+merge/289626 Your team Widelands Developers is requested to review

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

2016-03-21 Thread Miroslav Remák
I still don't understand where you're going with all this. > Should they be completely static - created only in editor? I think port_spaces_ should ALWAYS hold coordinates of all the port spaces defined in the map and we shouldn't ever need to call set_port_space during normal gameplay (except

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

2016-03-21 Thread Miroslav Remák
I don't understand, are these issues consequences of my changes? a) I can't reproduce it. When does this happen? Maybe include a savegame? b) Again, I don't know when or how this can happen. You shouldn't be allowed to build on such a spot... But maybe I am missing something. I'm not too

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

2016-03-21 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/bug-1559729-lost_portspace into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1559729 in widelands: "port space not shown" https://bugs.launchpad.net/widelands/+bug/1559729

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

2016-03-21 Thread Miroslav Remák
The proposal to merge lp:~widelands-dev/widelands/bug-1559729-lost_portspace into lp:widelands has been updated. Description changed to: If:  1. The second field to the SE of a possible port space is owned by the player,  2. AND the player hasn't expanded far enough to own the water fields

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1540813-island-hopping into lp:widelands

2016-03-20 Thread Miroslav Remák
Also, what made you even attempt such a strange fix? Have you experienced a similar issue before? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1540813-island-hopping/+merge/289579 Your team Widelands Developers is requested to review the proposed merge of

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1540813-island-hopping into lp:widelands

2016-03-20 Thread Miroslav Remák
Am I missing something? How did adding these two spaces fix the bug? There should be no difference. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1540813-island-hopping/+merge/289579 Your team Widelands Developers is requested to review the proposed merge of

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

2016-03-20 Thread Miroslav Remák
@Klaus Halfmann Also, did you notice the reproduction steps I posted in bug #1553699? Can you try these steps with the version used in the bug report (bzr7866) to see if they produce a crash and if so, try the same steps with this branch? --

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

2016-03-19 Thread Miroslav Remák
This basically fixes bug #1550568 in a better way in terms of performance. -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/improve-restool into

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

2016-03-19 Thread Miroslav Remák
@tiborb95 Yes, an empty undo action is created. Unfortunately, it doesn't seem to be trivial to fix because of all the "draw tool" mess. -- https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305 Your team Widelands Developers is subscribed to branch

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

2016-03-19 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/watchwindow-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/watchwindow-fixes/+merge/289573 - Fixes some oddities

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands

2016-03-19 Thread Miroslav Remák
Miroslav Remák has proposed merging lp:~widelands-dev/widelands/memleaks-and-uninit-vars into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/memleaks-and-uninit-vars/+merge/289561 This also

  1   2   >