[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands
Continuous integration builds have changed state: Travis build 1943. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/201326099. Appveyor build 1778. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1658489_epedition_tab-1778. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658489-epedition-tab. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands
Continuous integration builds have changed state: Travis build 1942. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/201307240. Appveyor build 1777. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1663490_ship_windows-1777. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1663490-ship-windows/+merge/317051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1663490-ship-windows. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands
1) I care. At least a bit. The test map didn't had any fish in the upper part of the pond (Not "0 of 4" but really "none"). So neither the fisher nor the fish breeder can do any work there. But I guess it is a seldom case and can be ignored. 2) Okay, fine by me. I don't think it is important for the forester since the user can easily see that the area is full of trees. And when it is a different part of the code, this minor detail can be done at another time. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands
Uh... I think one of us is reading the code wrong. Or maybe the code it behaving strange. As far as I see it: 1) Mark the objective as done (should be moved down to 3) 2) Wait one minute 3) Display dialog that objective is done 4) Wait 15 minutes 5) Start training site objective -- https://code.launchpad.net/~widelands-dev/widelands/bug-1661220-campaigns-barracks/+merge/317033 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
I'm a bit out of my depth with your questions. @SirVer: Do you know anything about this? The fix for the boost issue goes like this, so we might still need to define something somewhere: > Fixed in Git develop: I've added and documented two config macros: > BOOST_MATH_USE_FLOAT128 and BOOST_MATH_DISABLE_FLOAT128 which explicitly > enable/disable this feature. Defining the latter macro should fix things for > your use case. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands
Sounds good to me :) If you have an idea on how to get rid of the compiler warnings elegantly, please do go ahead. They are annoying, but behave differently with the different compilers. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658489-epedition-tab. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
>For GCC 4.7, see the following discussion:
I agree :)
Memo to self: remember to update the minimum required versions on
https://wl.widelands.org/wiki/BuildingWidelands/ once this lands.
Diff comments:
>
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt2016-12-04 14:32:55 +
> +++ CMakeLists.txt2017-02-13 18:13:48 +
> @@ -26,8 +26,8 @@
> wl_set_if_unset(WL_INSTALL_DATADIR "./data")
>
> if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
> - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
> -message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.")
> + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
> +message(FATAL_ERROR "Widelands needs GCC >= 4.8 to compile.")
>endif()
> elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
>if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.2)
Hm... the oldest version we build with on Travis is 3.4. Should this be changed
as well, or is that because older versions aren't available?
> @@ -139,19 +139,8 @@
> wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
The text above isn't shown (how tedious), but this is the full version:
```
if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8))
# Because of: https://svn.boost.org/trac/boost/ticket/9240.
wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
endif()
```
Apart from the cumbersome if-check (which could be removed), it looks like this
issue has been resolved in Boost 1.54 and later. I haven't verified it, but any
thoughts on whether this workaround should be kept?
>endif()
>
> - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
> -# g++-4.7 complains otherwise about <:: not being a valid token in
> -# unique_ptr<::Something>. Since this is common style in c++ though, we'd
> -# rather have it swallow this frog for us.
> -wl_add_flag(WL_GENERIC_CXX_FLAGS "-fpermissive")
> - endif()
> -
>wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")
> - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
> -wl_add_flag(WL_COMPILE_DIAGNOSTICS "-pedantic")
> - else()
> -wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpedantic")
> - endif()
> + wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wpedantic")
>wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wdeprecated-declarations")
>wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wextra")
>wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wformat")
--
https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258
Your team Widelands Developers is requested to review the proposed merge of
lp:~hjd/widelands/additional-compilers into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands
Will clean up the code along your comments, thx.
Diff comments:
>
> === modified file 'src/graphic/align.h'
> --- src/graphic/align.h 2017-01-25 18:55:59 +
> +++ src/graphic/align.h 2017-02-12 13:44:05 +
> @@ -24,29 +24,41 @@
>
> namespace UI {
>
> +/**
> + * This Enum is a binary mix of one-dimensional and two-dimensional
> alignments.
> + *
> + * bits 0,1 values 0,1,2,3 are horizontal
> + * bits 2,3 values 0,4,8,12 are vertical
> + *
> + * mixed aligenments are results of a binary | operation.
> + *
> + */
> +
> + // TODO(klaus.halfmann): as this is not a real enum all compiler warnings
> about
> + // incomplete usage are useless.
> +
> enum class Align {
> - kLeft = 0,
> - kHCenter = 1,
> - kRight = 2,
> - kHorizontal = 3,
> -
> - kTop = 0,
> - kVCenter = 4,
> - kBottom = 8,
> - kVertical = 12,
> -
> - kTopLeft = 0,
> - kCenterLeft = Align::kVCenter,
> - kBottomLeft = Align::kBottom,
> -
> - kTopCenter = Align::kHCenter,
> - kCenter = Align::kHCenter | Align::kVCenter,
> - kBottomCenter = Align::kHCenter | Align::kBottom,
> -
> - kTopRight = Align::kRight,
> - kCenterRight = Align::kRight | Align::kVCenter,
> -
> - kBottomRight = Align::kRight | Align::kBottom,
> + kLeft = 0x00,
This was "just" some warm up to understand the compiler warnings about alignent.
I intent to refactor this (if possible) into HAlign, VAlign and HVAlign, to
finally fix the warnings.
> + kHCenter= 0x01,
> + kRight = 0x02,
> + kHorizontal = 0x03,
> +
> + kTop= 0x00,
> + kVCenter= 0x04,
> + kBottom = 0x08,
> + kVertical = 0x0C,
> +
> + kTopLeft= kLeft | kTop,
> + kCenterLeft = kLeft | kVCenter,
> + kBottomLeft = kLeft | kBottom,
> +
> +kTopCenter = kHCenter | kTop,
> + kCenter = kHCenter | kVCenter,
> + kBottomCenter = kHCenter | kBottom,
> +
> + kTopRight = kRight | kTop,
> + kCenterRight= kRight | kVCenter,
> + kBottomRight= kRight | kBottom,
> };
>
> inline Align operator&(Align a, Align b) {
>
> === modified file 'src/notifications/notifications_impl.h'
> --- src/notifications/notifications_impl.h2017-01-25 18:55:59 +
> +++ src/notifications/notifications_impl.h2017-02-12 13:44:05 +
> @@ -70,7 +70,8 @@
>
> // Publishes 'message' to all subscribers.
> template void publish(const T& message) {
> - for (void* p_subscriber :
> note_id_to_subscribers_[T::note_id()]) {
> +std::list subscribers = note_id_to_subscribers_[T::note_id()];
> + for (void* p_subscriber : subscribers) {
I needed this, so I could inspect that list in the debugger. I will revert this.
> Subscriber* subscriber =
> static_cast*>(p_subscriber);
> subscriber->callback_(message);
> }
>
> === modified file 'src/ui_basic/box.cc'
> --- src/ui_basic/box.cc 2017-01-25 18:55:59 +
> +++ src/ui_basic/box.cc 2017-02-12 13:44:05 +
> @@ -376,16 +377,15 @@
> maxbreadth = get_inner_w();
> }
> switch (it.u.panel.align) {
> - case UI::Align::kHCenter:
> - breadth = (maxbreadth - breadth) / 2;
> - break;
> +case UI::Align::kHCenter:
> +breadth = (maxbreadth - breadth) >> 1;
It's totally unrelatet and I will revert this.
> +break;
>
> - case UI::Align::kRight:
> - breadth = maxbreadth - breadth;
> - break;
> - case UI::Align::kLeft:
> - default:
> - breadth = 0;
> +case UI::Align::kRight:
> +breadth = maxbreadth - breadth;
> +break;
> +default: // UI::Align::left
> +breadth = 0;
> }
>
> if (orientation_ == Horizontal)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1658489-epedition-tab.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
For GCC 4.7, see the following discussion: https://code.launchpad.net/~widelands-dev/widelands/less_compilers/+merge/316897 I wasn't aware that it's specified in CMakeLists.txt as well, could you take care of it? -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
Oh, sorry. It looks like I never posted the inline comment before right now. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
Sure, can fix :) Though (see my comment below), I still wonder what happened to GCC 4.7. If the required minimum version has been increased, then CMakeLists.txt and possibly other documentation should be updated alongside. Diff comments: > === modified file '.travis.yml' > --- .travis.yml 2017-02-11 10:48:12 + > +++ .travis.yml 2017-02-12 09:14:39 + > @@ -20,30 +20,26 @@ > - compiler: clang > env: CLANG_VERSION="3.5" BUILD_TYPE="Debug" > - compiler: clang > - env: CLANG_VERSION="3.8" BUILD_TYPE="Debug" > - - compiler: clang > env: CLANG_VERSION="3.9" BUILD_TYPE="Debug" > - compiler: clang > + env: CLANG_VERSION="4.0" BUILD_TYPE="Debug" > + - compiler: clang > env: CLANG_VERSION="3.4" BUILD_TYPE="Release" > - compiler: clang > env: CLANG_VERSION="3.5" BUILD_TYPE="Release" > - compiler: clang > - env: CLANG_VERSION="3.8" BUILD_TYPE="Release" > - - compiler: clang > env: CLANG_VERSION="3.9" BUILD_TYPE="Release" > + - compiler: clang > + env: CLANG_VERSION="4.0" BUILD_TYPE="Release" > - compiler: gcc > env: GCC_VERSION="4.8" BUILD_TYPE="Debug" Hm, this doesn't add up after I merged. Was GCC 4.7 removed intentionally? Because CMakeLists.txt still claims is the minimum required version? > - compiler: gcc > - env: GCC_VERSION="4.9" BUILD_TYPE="Debug" > - - compiler: gcc > env: GCC_VERSION="5" BUILD_TYPE="Debug" > - compiler: gcc > env: GCC_VERSION="6" BUILD_TYPE="Debug" > - compiler: gcc > env: GCC_VERSION="4.8" BUILD_TYPE="Release" > - compiler: gcc > - env: GCC_VERSION="4.9" BUILD_TYPE="Release" > - - compiler: gcc > env: GCC_VERSION="5" BUILD_TYPE="Release" > - compiler: gcc > env: GCC_VERSION="6" BUILD_TYPE="Release" -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands
P.S. pgettext means that the same string can be translated in multiple ways. So,
_("Foo");
_("Foo");
Will give us 1 message to translate, but
pgettext("context1", "Foo");
pgettext("context2", "Foo");
will give us 2 separate messages to translate.
--
https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/disambiguate_production_program_names into
lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands
Regarding 2), I had a look at the code now. At the moment, this works only with FindNodeResourceBreedable. For the foresters and gamekeepers, they use FindNodeSpace, which is a different program. We would need to just change the tooltip rather than send an "out of resources" message like we do for framers and lumberjacks etc. who also use FindNodeSpace. The foresters might be interesting (although low priority IMO - it's only a tooltip at the building). For the gamekeeper, I think it is irrelevant, because animals move around the map. So, we could try to do this for foresters in the future, but definitely not in this bug. Feel free to open a wishlist bug if you think we should have it :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
1. I don't have a better idea either. In Firefox, it's "Ctrl++" and "Ctrl+-", so it's the same solution without the blank spaces. 2. Good idea, I have split this. I don't think that we need to mention the zoom though, the user will notice that anyway. The important information here is which hotkeys to use to jump around. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/string-fixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands
We do want GCC_VERSION="4.9" - the only change in the diff should be replacing CLANG_VERSION="3.8" with CLANG_VERSION="4.0" -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands
_(), ngettext(), pgettext() and pgettext_exp() mark strings as translatable for the gettext translation system. -- https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands
1) Who cares if there were once fish or not? There are no fish now, that's all the user needs to know. Plus a hint for newbies on how to avoid it in the future. 2) Good idea, I need to have a look at the code to see what needs to be done for that. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1657117-fishbreeder-messages/+merge/317028 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1657117-fishbreeder-messages into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands
Review: Needs Fixing
The code for the fix looks good to me - there are quite a lot of other code
changes though, and I don't know what they are for (see diff comments).
I agree with merging the improved comments.
Diff comments:
> === modified file 'compile.sh'
> --- compile.sh2016-10-26 06:54:00 +
> +++ compile.sh2017-02-12 13:44:05 +
> @@ -158,8 +158,8 @@
> bzr pull
> cd build
> $buildtool
> -rm ../VERSION || true
> -rm ../widelands || true
> +rm -f ../VERSION || true
> +rm -f ../widelands || true
Changes to compile.sh don't belong in this branch.
> mv VERSION ../VERSION
> mv src/widelands ../widelands
> cd ..
>
> === modified file 'src/economy/expedition_bootstrap.h'
> --- src/economy/expedition_bootstrap.h2017-02-09 19:23:44 +
> +++ src/economy/expedition_bootstrap.h2017-02-12 13:44:05 +
> @@ -38,9 +38,16 @@
> class Warehouse;
> class Worker;
>
> -// Handles the mustering of workers and wares in a port for one Expedition.
> This
> -// object is created in the port dock as soon as the start expedition button
> is
> -// pressed. As soon as the ship is loaded, this object gets destroyed.
> +/**
> + * Handles the mustering of workers and wares in a port for an Expedition.
> + *
> + * This object is created in the port dock as soon as the start expedition
> button is
> + * pressed. As soon as the ship is loaded, this object gets destroyed.
> + * In case the Expedition is ::cancel()ed the wares will be returned to the
> port dock.
> + * Its the responsibility of the Owner to finally dispose a canceled
> ExpeditionBootstrap.
It's
> + *
> + */
> +
> class ExpeditionBootstrap {
> public:
> ExpeditionBootstrap(PortDock* const portdock);
> @@ -73,11 +83,18 @@
> // Delete all wares we currently handle.
> void cleanup(EditorGameBase& egbase);
>
> - // Save/Load this into a file. The actual data is stored in the
> buildingdata
> - // packet, and there in the warehouse data packet. The version
> parameter is
> - // the version number of the Warehouse packet.
Add the version parameter info back in.
> - void
> - load(Warehouse& warehouse, FileRead& fr, Game& game, MapObjectLoader&
> mol, uint16_t version);
> +/** Load this from a file.
> + *
> + * The actual data is stored in the buildingdata
> + * packet, and there in the warehouse data packet.
> + */
> + void load(Warehouse& warehouse, FileRead& fr, Game& game,
> MapObjectLoader& mol, uint16_t version);
> +
> +/** Save this into a file.
> + *
> + * The actual data is stored in the buildingdata
> + * packet, and there in the warehouse data packet.
> + */
> void save(FileWrite& fw, Game& game, MapObjectSaver& mos);
>
> private:
>
> === modified file 'src/graphic/align.h'
> --- src/graphic/align.h 2017-01-25 18:55:59 +
> +++ src/graphic/align.h 2017-02-12 13:44:05 +
> @@ -24,29 +24,41 @@
>
> namespace UI {
>
> +/**
> + * This Enum is a binary mix of one-dimensional and two-dimensional
> alignments.
> + *
> + * bits 0,1 values 0,1,2,3 are horizontal
Blank spaces after ,
> + * bits 2,3 values 0,4,8,12 are vertical
> + *
> + * mixed aligenments are results of a binary | operation.
> + *
> + */
> +
> + // TODO(klaus.halfmann): as this is not a real enum all compiler warnings
> about
> + // incomplete usage are useless.
> +
> enum class Align {
> - kLeft = 0,
> - kHCenter = 1,
> - kRight = 2,
> - kHorizontal = 3,
> -
> - kTop = 0,
> - kVCenter = 4,
> - kBottom = 8,
> - kVertical = 12,
> -
> - kTopLeft = 0,
> - kCenterLeft = Align::kVCenter,
> - kBottomLeft = Align::kBottom,
> -
> - kTopCenter = Align::kHCenter,
> - kCenter = Align::kHCenter | Align::kVCenter,
> - kBottomCenter = Align::kHCenter | Align::kBottom,
> -
> - kTopRight = Align::kRight,
> - kCenterRight = Align::kRight | Align::kVCenter,
> -
> - kBottomRight = Align::kRight | Align::kBottom,
> + kLeft = 0x00,
What is the reason for this change?
> + kHCenter= 0x01,
> + kRight = 0x02,
> + kHorizontal = 0x03,
> +
> + kTop= 0x00,
> + kVCenter= 0x04,
> + kBottom = 0x08,
> + kVertical = 0x0C,
> +
> + kTopLeft= kLeft | kTop,
> + kCenterLeft = kLeft | kVCenter,
> + kBottomLeft = kLeft | kBottom,
> +
> +kTopCenter = kHCenter | kTop,
> + kCenter = kHCenter | kVCenter,
> + kBottomCenter = kHCenter | kBottom,
> +
> + kTopRight = kRight | kTop,
> + kCenterRight= kRight | kVCenter,
> + kBottomRight= kRight | kBottom,
> };
>
> inline Align operator&(Align a, Align b) {
>
> === modified file 'src/notifications/notifications_impl.h'
> --- src/notifications/notifications_impl.h2017-01-25 18:55:59 +
> +++ src/notifications/notifications_impl.h2017-02-12 13:44:05 +
> @@ -70,7 +70,8 @@
>
>
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cleanup-networking-messages into lp:widelands
Review: Resubmit My grep results are the same as Notabilis'. I have also added a link to the metaserver code in the comments. -- https://code.launchpad.net/~widelands-dev/widelands/cleanup-networking-messages/+merge/316974 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cleanup-networking-messages. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1663490-ship-windows into lp:widelands
Review: Needs Fixing The proposed fix will make logic know about wui again, which we don't want. Check if you can use UniqueWindowHandler to solve this. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1663490-ship-windows/+merge/317051 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1663490-ship-windows. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands
You can use bzr shelve for resolving conflicts like this. At least the changes are still there :) I'd move msg_boxes(barracks_story_end) before the sleep time, or split up the sleep time. The way it is now, it will take a long time for the player to receive the confirmation, and it will be followed by the trainingsite introduction immediately. You can add a custom sleep time to set_objective_done(o) as a second parameter to have less lines in the code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1661220-campaigns-barracks/+merge/317033 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1661220-campaigns-barracks into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
