[Widelands-dev] [Merge] lp:~widelands-dev/widelands/editor_new_map into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/editor_new_map into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/editor_new_map/+merge/280351 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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/militarysites into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/militarysites into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/militarysites/+merge/280069 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/militarysites. ___ 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/number_glob into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/number_glob into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/number_glob/+merge/278192 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/number_glob. ___ 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/rtl_wordwrap into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/rtl_wordwrap into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/rtl_wordwrap/+merge/273968 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rtl_wordwrap. ___ 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/ai_ship_tweaks into lp:widelands
Review: Resubmit OK, so I made some (final for now) tweaks. Default name after the list if exhausted is 'Ship $id'. Currently a ship does not store name in its object, this have to be added to allow renaming. Also there is still no list of ships (lake a vector of player or so). But I tried to locate list of player's buildings and failed. Is there such list? Expecially when UI shows statistics about buildings - where does it take the data from??? -- https://code.launchpad.net/~widelands-dev/widelands/ai_ship_tweaks/+merge/280192 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_ship_tweaks. ___ 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/request_supply_opt into lp:widelands
Resubmit. I removed controversial treshold, and added two features a) if more wares (of the same type) on one flag, only one ware is considered b) wares on ships are ignored. Routing is deceived because it considers port's flag as a actual location of ware/worker. -- https://code.launchpad.net/~widelands-dev/widelands/request_supply_opt/+merge/280193 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/request_supply_opt 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
Merged and pushed. :) (Haven't generated new translation templates though) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/clang_warnings into lp:widelands
I can't compile or test right now, but code LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/clang_warnings/+merge/281383 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/clang_warnings 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-536409 into lp:widelands
Thanks for all the reviews :) -- https://code.launchpad.net/~widelands-dev/widelands/bug-536409/+merge/280352 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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/editor_new_map into lp:widelands
Making the buttons for climate and resources narrower might create problems with translations, so I'd rather leave them as they are for now. > BTW is it possible to have more then 3 lines before and after the changed > lines? I don't understand the question. -- https://code.launchpad.net/~widelands-dev/widelands/editor_new_map/+merge/280351 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/editor_new_map. ___ 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/table_align into lp:widelands
Why could the savegame not be loaded? We might have changed a packet version somewhere in the meantime... anyway, this branch is UI only, and the savegae not loading is a different bug - if it is a bug. The screenshot bug is also unrelated to this branch. -- https://code.launchpad.net/~widelands-dev/widelands/table_align/+merge/279685 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/table_align 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
Thanks. Could someone please merge my approved branches, unless they contain difficult merge conflicts? It will take some time until I can do this myself again. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ 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/clang_warnings into lp:widelands
SirVer has proposed merging lp:~widelands-dev/widelands/clang_warnings into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/clang_warnings/+merge/281383
Fixes some compile warnings for clang.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/clang_warnings into lp:widelands.
=== modified file 'src/economy/fleet.cc'
--- src/economy/fleet.cc 2015-11-03 10:39:08 +
+++ src/economy/fleet.cc 2015-12-28 10:11:15 +
@@ -580,7 +580,7 @@
if (m_ships.empty() && m_ports.empty()) {
remove(egbase);
- } else if (upcast(Game, game, &egbase)) {
+ } else if (is_a(Game, &egbase)) {
// Some ship perhaps lose their destination now, so new a destination must be appointed (if any)
molog("Port removed from fleet, triggering fleet update\n");
update(egbase);
=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc 2015-11-11 09:52:55 +
+++ src/economy/ware_instance.cc 2015-12-28 10:11:15 +
@@ -643,8 +643,7 @@
} catch (const std::exception & e) {
throw wexception("WareInstance: %s", e.what());
}
-
- return nullptr; // Should never be reached
+ throw wexception("Never here.");
}
}
=== modified file 'src/logic/soldier.cc'
--- src/logic/soldier.cc 2015-12-03 08:45:37 +
+++ src/logic/soldier.cc 2015-12-28 10:11:15 +
@@ -58,18 +58,6 @@
namespace {
-/**
- * remove spaces at the beginning or the end of a string
- */
-void remove_spaces(std::string& s) {
- while (s[0] == ' ' || s[0] == '\t' || s[0] == '\n')
- s.erase(0, 1);
-
- while (*s.rbegin() == ' ' || * s.rbegin() == '\t' || * s.rbegin() == '\n')
- s.erase(s.size() - 1, 1);
-}
-
-
constexpr int kRetreatWhenHealthDropsBelowThisPercentage = 50;
} // namespace
=== modified file 'src/map_io/map_players_messages_packet.cc'
--- src/map_io/map_players_messages_packet.cc 2015-12-03 19:32:15 +
+++ src/map_io/map_players_messages_packet.cc 2015-12-28 10:11:15 +
@@ -59,27 +59,23 @@
{
MessageQueue::const_iterator const begin = messages.begin();
if (begin != messages.end()) {
- log
- ("ERROR: The message queue for player %u contains a message "
- "before any messages have been loaded into it. This is a bug "
- "in the savegame loading code. It created a new message and "
- "added it to the queue. This is only allowed during "
- "simulation, not at load. The following messge will be "
- "removed when the queue is reset:\n"
- "\tstype : %u\n"
- "\ttitle : %s\n"
- "\tsent: %u\n"
- "\tposition: (%i, %i)\n"
- "\tstatus : %u\n"
- "\tbody: %s\n",
- p,
- begin->second->type(),
- begin->second->title ().c_str(),
- begin->second->sent(),
- begin->second->position().x, begin->second->position().y,
- begin->second->status (),
- begin->second->body().c_str());
- messages.clear();
+ log("ERROR: The message queue for player %u contains a message "
+ "before any messages have been loaded into it. This is a bug "
+ "in the savegame loading code. It created a new message and "
+ "added it to the queue. This is only allowed during "
+ "simulation, not at load. The following messge will be "
+ "removed when the queue is reset:\n"
+ "\tstype : %u\n"
+ "\ttitle : %s\n"
+ "\tsent: %u\n"
+ "\tposition: (%i, %i)\n"
+ "\tstatus : %u\n"
+ "\tbody: %s\n",
+ p, static_cast(begin->second->type()), begin->second->title().c_str(),
+ begin->second->sent(), begin->second->position().x,
+ begin->second->position().y, static_cast(begin->second->status()),
+ begin->second->body().c_str());
+ messages.clear();
}
}
=== modified file 'src/map_io/map_players_view_packet.cc'
--- src/map_io/map_players_view_packet.cc 2015-11-14 13:18:24 +
+++ src/map_io/map_players_view_packet.cc 2015-12-28 10:11:15 +
@@ -176,12 +176,6 @@
// Errors for the Read* functions.
-struct TribeNonexistent : public FileRead::DataError {
- TribeNonexistent(char const* const Name)
- : DataError("tribe \"%s\" does not exist", Name), name(Name) {
- }
- char const* const name;
-};
struct TribeImmovableNonexistent : public FileRead::DataError {
TribeImmovableNonexistent(const std::string& Name)
: DataError("immovable type \"%s\" does not seem to be a tribe immovable", Name.c_str()),
=== modified file 'src/wui/encyclopedia_window.h'
--- src/wui/encyclopedia_window.h 2015-11-21 11:47:05 +
+++ src/wui/encyclopedia_window.h 2015-12-28 10:11:15 +
@@ -40,9 +40,8 @@
private:
struct EncyclopediaEntry {
- EncyclopediaEntry(const EncyclopediaEntry& other)
- : EncyclopediaEntry(other.index, other.d
