widelands-dev team mailing list archive

[TiborB <tiborb95@xxxxxxxxx>]

packet increased, see question in diff.

Diff comments:

> 
> === modified file 'src/game_io/game_player_info_packet.cc'
> --- src/game_io/game_player_info_packet.cc	2014-10-12 07:35:42 +0000
> +++ src/game_io/game_player_info_packet.cc	2015-10-19 20:06:10 +0000
> @@ -30,7 +30,12 @@
>  
>  namespace Widelands {
>  
> +<<<<<<< TREE
>  constexpr uint16_t kCurrentPacketVersion = 16;
> +=======
> +#define CURRENT_PACKET_VERSION 16

I increased version from 15 to 16, but it seems, that there is some conflict (no problem for me) but I need to increase the version to 17, correct?

> +
> +>>>>>>> MERGE-SOURCE
>  
>  void GamePlayerInfoPacket::read
>  	(FileSystem & fs, Game & game, MapObjectLoader *) {


-- 
https://code.launchpad.net/~widelands-dev/widelands/ai_persistent_data/+merge/271853
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_persistent_data.