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

2014-11-27 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-768826 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 -- Your team Widelands Developers is subscribed to branch lp:~

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

2014-11-27 Thread GunChleoc
No problem. Let me know if you need help with the Lua tests, I have written a few simple ones for the building descriptions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-7688

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

2014-11-27 Thread TiborB
OK, and thanks for saving me from this work, I am struggling with that LUA testing now... -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. __

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

2014-11-27 Thread GunChleoc
Review: Approve They are, except for the first variable. That looks weird, so I have removed it. Going to merge now. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. __

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

2014-11-27 Thread TiborB
re: "- In the editor, remove the blank space between ( and the first coordinate" Talking about this line? static boost::format node_format("(%3i, %3i, %2i)"); Because there is no space. But I can say that numbers between % and i are flatly ignored, if you know how to make them work... -- https

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

2014-11-27 Thread GunChleoc
LGTM, except for a couple more nits. One functionality change: - In the editor, remove the blank space between ( and the first coordinate And two code style nits: - add operator padding to (is_game)?25:5 (codecheck doesn't catch this case, but it should look like this: (is_game) ? 25 : 5) - P

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

2014-11-26 Thread TiborB
@GunChleoc: done, can check it now :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. ___ Mailing list: https://launchpad.net

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

2014-11-26 Thread GunChleoc
I have had a liik at the code now - maybe you could move the dst.blit( part outside the if/else again, this way we get less code. const std::string node_text will then also need to be declared outside and lose the const. When you remove the gametime from the editor, don't forget to move the FPS

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

2014-11-26 Thread TiborB
OK, going to hide it -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. ___ Mailing list: https://launchpad.net/~widelands-dev P

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

2014-11-26 Thread GunChleoc
No, that was just me being lazy when I added it to the debug screen. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. ___ Mail

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

2014-11-25 Thread TiborB
Also, I can see that the elapsed time is shown in editor - is it needed? -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. ___

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

2014-11-25 Thread TiborB
Hey, I implemented your comments. Also now the height is shown only in editor. -- https://code.launchpad.net/~widelands-dev/widelands/bug-768826/+merge/242544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-768826. __

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

2014-11-22 Thread GunChleoc
Review: Needs Fixing draw_overlay needs to know if it's drawing for the editor or for a game/replay. I don't know how the control flow is here and what is accessible from the function; you might need to add a function parameter. Some more comments in the diff. Diff comments: > === modified fi

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

2014-11-21 Thread TiborB
TiborB has proposed merging lp:~widelands-dev/widelands/bug-768826 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #768826 in widelands: "Show altitude level in the editor" https://bugs.launchpad.net/widelands/+bug/768826 For more details, see: