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

2016-03-08 Thread noreply 
The proposal to merge lp:~widelands-dev/widelands/bug-1395278-game_io into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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-1395278-game_io into lp:widelands

2016-03-07 Thread GunChleoc 
Thanks!

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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

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

2016-03-07 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 805. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/114111214.
Appveyor build 651. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1395278_game_io-651.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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

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

2016-03-07 Thread bunnybot 
Bunnybot encountered an error while working on this merge proposal:

Running 'git fetch bzr_origin' failed. Output:

fatal: 'bzr_origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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

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

2016-03-07 Thread bunnybot 
Bunnybot encountered an error while working on this merge proposal:

Running 'git fetch bzr_origin' failed. Output:

fatal: 'bzr_origin' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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-1395278-game_io into lp:widelands

2016-03-05 Thread GunChleoc 
I'm on the road right now - do you have time to fix the merge conflicts for me?
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io 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

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

2016-03-04 Thread Klaus Halfmann 
Klaus Halfmann has proposed merging 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1395278 in widelands: "Consolidate naming of member variables"
  https://bugs.launchpad.net/widelands/+bug/1395278

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1395278-game_io/+merge/288172

Checked the code and played a game (with some stores and loads)
LGTM
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-1395278-game_io into lp:widelands.
=== modified file 'src/game_io/game_loader.cc'
--- src/game_io/game_loader.cc	2016-03-02 16:30:42 +
+++ src/game_io/game_loader.cc	2016-03-04 20:31:45 +
@@ -40,12 +40,16 @@
 namespace Widelands {
 
 GameLoader::GameLoader(const std::string & path, Game & game) :
+<<<<<<< TREE
 	m_fs(*g_fs->make_sub_file_system(path)), game_(game)
+===
+	fs_(*g_fs->make_sub_file_system(path)), game_(game)
+>>>>>>> MERGE-SOURCE
 {}
 
 
 GameLoader::~GameLoader() {
-	delete _fs;
+	delete _;
 }
 
 /*
@@ -53,7 +57,11 @@
  */
 int32_t GameLoader::preload_game(GamePreloadPacket & mp) {
 	// Load elemental data block
+<<<<<<< TREE
 	mp.read(m_fs, game_, nullptr);
+===
+	mp.read(fs_, game_, nullptr);
+>>>>>>> MERGE-SOURCE
 
 	return 0;
 }
@@ -65,19 +73,35 @@
 	ScopedTimer timer("GameLoader::load() took %ums");
 
 	log("Game: Reading Preload Data ... ");
+<<<<<<< TREE
 	{GamePreloadPacket p; p.read(m_fs, game_);}
+===
+	{GamePreloadPacket p; p.read(fs_, game_);}
+>>>>>>> MERGE-SOURCE
 	log("took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Reading Game Class Data ... ");
+<<<<<<< TREE
 	{GameClassPacket  p; p.read(m_fs, game_);}
+===
+	{GameClassPacket  p; p.read(fs_, game_);}
+>>>>>>> MERGE-SOURCE
 	log("took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Reading Map Data ... ");
+<<<<<<< TREE
 	GameMapPacket M;  M.read(m_fs, game_);
+===
+	GameMapPacket M;  M.read(fs_, game_);
+>>>>>>> MERGE-SOURCE
 	log("Game: Reading Map Data took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Reading Player Info ... ");
+<<<<<<< TREE
 	{GamePlayerInfoPacket p; p.read(m_fs, game_);}
+===
+	{GamePlayerInfoPacket p; p.read(fs_, game_);}
+>>>>>>> MERGE-SOURCE
 	log("Game: Reading Player Info took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Calling read_complete()\n");
@@ -87,15 +111,27 @@
 	MapObjectLoader * const mol = M.get_map_object_loader();
 
 	log("Game: Reading Player Economies Info ... ");
+<<<<<<< TREE
 	{GamePlayerEconomiesPacketp; p.read(m_fs, game_, mol);}
+===
+	{GamePlayerEconomiesPacketp; p.read(fs_, game_, mol);}
+>>>>>>> MERGE-SOURCE
 	log("took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Reading ai persistent data ... ");
+<<<<<<< TREE
 	{GamePlayerAiPersistentPacket   p; p.read(m_fs, game_, mol);}
+===
+	{GamePlayerAiPersistentPacket   p; p.read(fs_, game_, mol);}
+>>>>>>> MERGE-SOURCE
 	log("took %ums\n", timer.ms_since_last_query());
 
 	log("Game: Reading Command Queue Data ... ");
+<<<<<<< TREE
 	{GameCmdQueuePacket   p; p.read(m_fs, game_, mol);}
+===
+	{GameCmdQueuePacket   p; p.read(fs_, game_, mol);}
+>>>>>>> MERGE-SOURCE
 	log("took %ums\n", timer.ms_since_last_query());
 
 	//  This must be after the command queue has been read.
@@ -104,14 +140,19 @@
 	iterate_players_existing_const(p, nr_players, game_, player) {
 		const MessageQueue & messages = player->messages();
 		for (std::pair<MessageId, Message *> temp_message : messages) {
-			Message* m = temp_message.second;
-			MessageId m_id = temp_message.first;
+			Message* message = temp_message.second;
+			MessageId message_id = temp_message.first;
 
 			// Renew MapObject connections
+<<<<<<< TREE
 			if (m->serial() > 0) {
 MapObject* mo = game_.objects().get_object(m->serial());
+===
+			if (message->serial() > 0) {
+MapObject* mo = game_.objects().get_object(message->serial());
+>>>>>>> MERGE-SOURCE
 mo->removed.connect
-	(boost::bind(::message_object_removed, player, m_id));
+	(boost: