Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687043-multiline-edit into lp:widelands
Review: Approve compile, test, regressiontest Multilineedit fields are ok (even with German Umauts), word wrap is a bit early. Lets go. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1687043-multiline-edit/+merge/323428 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687043-multiline-edit. ___ 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-1687043-multiline-edit into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1687043-multiline-edit into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1687043-multiline-edit/+merge/323428 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1687043-multiline-edit. ___ 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/fh1_width_and_mapobject_messages into lp:widelands
Found it - when buildings send player messages, the representative image is grabbed for its width, and that's done without player color. So, I changed the hash for the cashing in the animation manager. I could have just changed the call in [1], but I figured that changing the hash is safer, although it comes at the cost of more memory usage. If you think that's code safety overkill, I'll be happy to do it the other way around. [1] http://bazaar.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/view/head:/src/logic/map_objects/tribes/building.cc#L743 -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into lp:widelands has been updated. Commit Message changed to: The new font renderer now sets the width properly and supports player color for images. - Added width property to img tag - Buildings and ships now send their messages with the new font renderer. - Messages try to render with the new font renderer first, then fall back to the old font renderer for layouting messages that haven't been converted yet (and from savegames). - Fixed memory leak in player_color. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1655168 in widelands: "statistic window: switch ealier to hours instead
of minutes"
https://bugs.launchpad.net/widelands/+bug/1655168
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1655168-statistics-overlap/+merge/323441
Fixing overlap of labels in the plot of the ware statistics.
Also moves y-labels a bit since they overlapped with the axis, especially the
min-value in the economy health.
It can still happen that the label "minutes" or the y-labels overlap with the
graph. A possible improvement would be to change the drawing order from
diagram-data-zeroLine to zeroLine-data-diagram.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands.
=== modified file 'src/wui/plot_area.cc'
--- src/wui/plot_area.cc 2017-02-24 19:22:36 +
+++ src/wui/plot_area.cc 2017-04-30 10:00:24 +
@@ -79,7 +79,7 @@
}
/**
- * scale value down to the available space, which is specifiey by
+ * scale value down to the available space, which is specified by
* the length of the y axis and the highest scale.
*/
float scale_value(float const yline_length, uint32_t const highest_scale, int32_t const value) {
@@ -184,6 +184,12 @@
dst.blit(point, pic, BlendMode::UseAlpha, UI::Align::kRight);
}
+uint32_t calc_max_ticks(int32_t plot_width) {
+ // Render a number with 3 digits (maximal length which should appear)
+ const Image* pic = UI::g_fh1->render(ytick_text_style(" -888 ", kAxisLineColor));
+ return plot_width / pic->width();
+}
+
/**
* draw the background and the axis of the diagram
*/
@@ -218,6 +224,8 @@
}
// Make sure that we always have a tick
how_many_ticks = std::max(how_many_ticks, 1u);
+ // Make sure we haven't more ticks than we have space for -> avoid overlap
+ how_many_ticks = std::min(how_many_ticks, calc_max_ticks(inner_w));
// first, tile the background
dst.tile(Recti(Vector2i(0, 0), inner_w, inner_h), g_gr->images().get(BG_PIC), Vector2i(0, 0));
@@ -460,7 +468,7 @@
// print the maximal value into the top right corner
draw_value(yscale_label, RGBColor(60, 125, 0),
- Vector2f(get_inner_w() - kSpaceRight - 2, kSpacing + 2), dst);
+ Vector2f(get_inner_w() - kSpaceRight - 3, kSpacing + 2), dst);
// plot the pixels
for (uint32_t plot = 0; plot < plotdata_.size(); ++plot) {
@@ -646,7 +654,7 @@
// Print the min value
draw_value((boost::format("-%u") % (highest_scale_)).str(), RGBColor(125, 0, 0),
- Vector2f(get_inner_w() - kSpaceRight - 2, get_inner_h() - kSpacing - 15), dst);
+ Vector2f(get_inner_w() - kSpaceRight - 3, get_inner_h() - kSpacing - 23), dst);
// draw zero line
dst.draw_line_strip({Vector2f(get_inner_w() - kSpaceRight, yoffset),
___
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/fh1_width_and_mapobject_messages into lp:widelands
Review: Needs Fixing compile I got an Error from my compiler as follows: fh1_width_and_mapobject_messages/src/graphic/animation.cc:232:9: error: no viable conversion from returned value of type 'unique_ptr>' to function return type 'unique_ptr>' return rv; I would expect our autmated build will run into this, too. Maybe the compiler nees a hint how to cast these objects? -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1685331-oldsaves
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1685331 in widelands: "Barracks can't be built with old savegames"
https://bugs.launchpad.net/widelands/+bug/1685331
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442
Fixes problems with loading pre-barracks savegames. These savegames load
without problems, but do not have the barracks building allowed. Since at the
same time soldiers can no longer be created in the headquarters, continue
playing the savegames becomes quite hard.
This branch fixes this problem by enabling the barracks on loading of old
savegames. The savegame is recognized by an error in the warehouses when they
notice the missing data about recruits in the file. Since this error only
happens with old savegames, the barracks are not enabled for new savegames from
e.g. the campaign (where the barracks are disabled by design).
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands.
=== modified file 'data/tribes/atlanteans.lua'
--- data/tribes/atlanteans.lua 2016-12-03 16:37:13 +
+++ data/tribes/atlanteans.lua 2017-04-30 12:47:37 +
@@ -351,4 +351,5 @@
ship = "atlanteans_ship",
headquarters = "atlanteans_headquarters",
port = "atlanteans_port",
+ barracks = "atlanteans_barracks",
}
=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua 2016-11-12 06:50:18 +
+++ data/tribes/barbarians.lua 2017-04-30 12:47:37 +
@@ -284,4 +284,5 @@
ship = "barbarians_ship",
headquarters = "barbarians_headquarters",
port = "barbarians_port",
+ barracks = "barbarians_barracks",
}
=== modified file 'data/tribes/empire.lua'
--- data/tribes/empire.lua 2016-11-12 06:50:18 +
+++ data/tribes/empire.lua 2017-04-30 12:47:37 +
@@ -325,4 +325,5 @@
ship = "empire_ship",
headquarters = "empire_headquarters",
port = "empire_port",
+ barracks = "empire_barracks",
}
=== modified file 'src/logic/map_objects/tribes/tribe_descr.cc'
--- src/logic/map_objects/tribes/tribe_descr.cc 2017-01-25 18:55:59 +
+++ src/logic/map_objects/tribes/tribe_descr.cc 2017-04-30 12:47:37 +
@@ -204,6 +204,7 @@
headquarters_ = add_special_building(table.get_string("headquarters"));
port_ = add_special_building(table.get_string("port"));
+ barracks_ = add_special_building(table.get_string("barracks"));
} catch (const GameDataError& e) {
throw GameDataError("tribe %s: %s", name_.c_str(), e.what());
@@ -328,6 +329,10 @@
assert(tribes_.building_exists(port_));
return port_;
}
+DescriptionIndex TribeDescr::barracks() const {
+ assert(tribes_.building_exists(barracks_));
+ return barracks_;
+}
const std::vector& TribeDescr::worker_types_without_cost() const {
return worker_types_without_cost_;
}
=== modified file 'src/logic/map_objects/tribes/tribe_descr.h'
--- src/logic/map_objects/tribes/tribe_descr.h 2017-01-25 18:55:59 +
+++ src/logic/map_objects/tribes/tribe_descr.h 2017-04-30 12:47:37 +
@@ -104,6 +104,7 @@
DescriptionIndex ship() const;
DescriptionIndex headquarters() const;
DescriptionIndex port() const;
+ DescriptionIndex barracks() const;
const std::vector& worker_types_without_cost() const;
uint32_t frontier_animation() const;
@@ -183,6 +184,7 @@
DescriptionIndex ship_; // The ship that this tribe uses
DescriptionIndex headquarters_; // The tribe's default headquarters, needed by the editor
DescriptionIndex port_; // The port that this tribe uses
+ DescriptionIndex barracks_; // The barracks to create soldiers
std::vector worker_types_without_cost_;
// Order and positioning of wares in the warehouse display
WaresOrder wares_order_;
=== modified file 'src/logic/map_objects/tribes/warehouse.cc'
--- src/logic/map_objects/tribes/warehouse.cc 2017-04-23 12:11:19 +
+++ src/logic/map_objects/tribes/warehouse.cc 2017-04-30 12:47:37 +
@@ -366,6 +366,26 @@
owner().player_number(),
owner().tribe().get_worker_descr(worker_index)->descname().c_str(),
descr().descname().c_str(), serial(), get_position().x, get_position().y, next_spawn);
+ // Check if it is an recruit. If it is, enable barracks.
+ // We are most likely loading a pre-barracks savegame in that case, so when not
+ // adding the barracks the game becomes unplayable. Note that this might be strange in
+ // old savegames of campaigns or scenarios (e.g. barracks allowed but no weapons possible)
+ const DescriptionIndex barracks_id = owner().tribe().barracks();
+ const ProductionSiteDescr* barracksDescr =
+dynamic_cast(owner().tribe().get_building_descr(barracks_id));
+ assert(barracksDescr != nullptr);
+ const BillOfMaterials& recruits = barracksDescr->input_workers();
+ for (const
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands
Review: Approve Code LGTM, not tested. Could you please add a TODO as a marker to remove the code in warehouse.cc the next time we remove savegame compatibility? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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-1685331-oldsaves into lp:widelands
No problem, is done. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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/fh1_width_and_mapobject_messages into lp:widelands
How does your compiler like it now? -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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/fh1_width_and_mapobject_messages into lp:widelands
Sorry, still does not like it, Attaching the complete messages, maybe it can help you ... bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/ M src/wui/waresdisplay.cc Alle Änderungen erfolgreich angewendet. Now on revision 8318. $ ./compile.sh [ 45%] Building CXX object src/graphic/CMakeFiles/graphic.dir/animation.cc.o fh1_width_and_mapobject_messages/src/graphic/animation.cc:156:22: warning: implicit conversion increases floating-point precision: 'float' to 'double' [-Wdouble-promotion] scale_, image_files_[0].c_str()); ^~~~ fh1_width_and_mapobject_messages/src/base/wexception.h:60:56: note: expanded from macro 'wexception' #define wexception(...) WException(__FILE__, __LINE__, __VA_ARGS__) ~~ ^~~ fh1_width_and_mapobject_messages/src/graphic/animation.cc:232:9: error: no viable conversion from returned value of type 'unique_ptr' to function return type 'unique_ptr' return rv; ^~ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2565:29: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'std::unique_ptr' to 'const std::__1::unique_ptr > &' for 1st argument class _LIBCPP_TYPE_VIS_ONLY unique_ptr ^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2594:49: note: candidate constructor not viable: no known conversion from 'std::unique_ptr' to 'nullptr_t' for 1st argument _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT ^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2621:31: note: candidate constructor not viable: no known conversion from 'std::unique_ptr' to 'std::__1::unique_ptr > &&' for 1st argument _LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT ^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2625:9: note: candidate constructor [with _Up = Texture, _Ep = std::__1::default_delete] not viable: no known conversion from 'std::unique_ptr' to 'unique_ptr > &&' for 1st argument unique_ptr(unique_ptr<_Up, _Ep>&& __u, ^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2640:35: note: candidate template ignored: could not match 'auto_ptr' against 'unique_ptr' _LIBCPP_INLINE_VISIBILITY unique_ptr(auto_ptr<_Up>&& __p, ^ fh1_width_and_mapobject_messages/src/graphic/animation.cc:339:27: warning: moving a temporary object prevents copy elision [-Wpessimizing-move] std::make_pair(hash, std::move(g_gr->animations().get_animation(id).representative_image(clr; ^ fh1_width_and_mapobject_messages/src/graphic/animation.cc:339:27: note: remove std::move call here std::make_pair(hash, std::move(g_gr->animations().get_animation(id).representative_image(clr; ^~ -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1655168-statistics-overlap into lp:widelands
Continuous integration builds have changed state: Travis build 2131. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227334675. Appveyor build 1966. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1655168_statistics_overlap-1966. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1655168-statistics-overlap/+merge/323441 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1655168-statistics-overlap 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/fh1_width_and_mapobject_messages into lp:widelands
This is a const issue. Const Image vs (nonconst) texture. Just a guess - I am on mobile and can't decipher the code. > Am 30.04.2017 um 19:22 schrieb Klaus Halfmann : > > Sorry, still does not like it, Attaching the complete messages, maybe it can > help you > > ... > bzr+ssh://bazaar.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/ > M src/wui/waresdisplay.cc > > > Alle Änderungen erfolgreich angewendet. > > > Now on revision 8318. > $ ./compile.sh > > [ 45%] Building CXX object src/graphic/CMakeFiles/graphic.dir/animation.cc.o > fh1_width_and_mapobject_messages/src/graphic/animation.cc:156:22: warning: > implicit conversion increases floating-point > precision: 'float' to 'double' [-Wdouble-promotion] > scale_, > image_files_[0].c_str()); > > ^~~~ > fh1_width_and_mapobject_messages/src/base/wexception.h:60:56: note: expanded > from macro 'wexception' > #define wexception(...) WException(__FILE__, __LINE__, __VA_ARGS__) >~~ ^~~ > fh1_width_and_mapobject_messages/src/graphic/animation.cc:232:9: error: no > viable conversion from returned value of type > 'unique_ptr' to function return type 'unique_ptr' >return rv; > ^~ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2565:29: > note: candidate constructor > (the implicit copy constructor) not viable: no known conversion from > 'std::unique_ptr' to 'const std::__1::unique_ptr std::__1::default_delete > &' for 1st argument > class _LIBCPP_TYPE_VIS_ONLY unique_ptr >^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2594:49: > note: candidate constructor not viable: > no known conversion from 'std::unique_ptr' to 'nullptr_t' for > 1st argument >_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT >^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2621:31: > note: candidate constructor not viable: > no known conversion from 'std::unique_ptr' to > 'std::__1::unique_ptr > > &&' for 1st argument >_LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT > ^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2625:9: > note: candidate constructor [with _Up = > Texture, _Ep = std::__1::default_delete] not viable: no known > conversion from 'std::unique_ptr' to 'unique_ptr std::__1::default_delete > &&' for 1st argument >unique_ptr(unique_ptr<_Up, _Ep>&& __u, >^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/memory:2640:35: > note: candidate template ignored: could > not match 'auto_ptr' against 'unique_ptr' >_LIBCPP_INLINE_VISIBILITY unique_ptr(auto_ptr<_Up>&& __p, > ^ > fh1_width_and_mapobject_messages/src/graphic/animation.cc:339:27: warning: > moving a temporary object prevents copy elision > [-Wpessimizing-move] > std::make_pair(hash, > std::move(g_gr->animations().get_animation(id).representative_image(clr; >^ > fh1_width_and_mapobject_messages/src/graphic/animation.cc:339:27: note: > remove std::move call here > std::make_pair(hash, > std::move(g_gr->animations().get_animation(id).representative_image(clr; >^~ > > > -- > https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 > You are reviewing the proposed merge of > lp:~widelands-dev/widelands/fh1_width_and_mapobject_messages into > lp:widelands. -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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/fh1_width_and_mapobject_messages into lp:widelands
Yes it is. The same issue is there in player_color, which you refactored by using an auto. However, we have things spread out here to the calling function, which is a problem for clang, but not for gcc. So, I attempted having a pointer first and creating the unique_pointer on return. Can't make the texture itself const, because we're blitting into it. -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1685331-oldsaves into lp:widelands
Continuous integration builds have changed state: Travis build 2132. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227354900. Appveyor build 1967. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1685331_oldsaves-1967. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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-1685331-oldsaves into lp:widelands
Just noticing: My last commit message is a bit broken. The first "Removed" should actually be an "Added". :-D -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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/fh1_width_and_mapobject_messages into lp:widelands
Continuous integration builds have changed state: Travis build 2134. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/227422140. Appveyor build 1969. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_width_and_mapobject_messages-1969. -- https://code.launchpad.net/~widelands-dev/widelands/fh1_width_and_mapobject_messages/+merge/318189 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fh1_width_and_mapobject_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-1685331-oldsaves into lp:widelands
I attached 2 savegames to the branch - one of them doesn't create a barracks. It might be easier to always make sure that we allow a barracks and live with it that it breaks some scenario restrictions. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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-1685331-oldsaves into lp:widelands
Review: Needs Fixing -- https://code.launchpad.net/~widelands-dev/widelands/bug-1685331-oldsaves/+merge/323442 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1685331-oldsaves. ___ 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
