← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/bug-1786597-test-suite into lp:widelands

 

Inline comment.
Also, if you haven't done it, check this comment:
https://bugs.launchpad.net/widelands/+bug/1535115/comments/33

Diff comments:

> === modified file 'src/logic/map_objects/tribes/carrier.cc'
> --- src/logic/map_objects/tribes/carrier.cc	2018-08-09 11:11:15 +0000
> +++ src/logic/map_objects/tribes/carrier.cc	2018-08-11 11:58:45 +0000
> @@ -433,9 +435,14 @@
>  	try {
>  
>  		uint8_t packet_version = fr.unsigned_8();
> -		if (packet_version == kCurrentPacketVersion) {
> +		if (packet_version >= 1 && packet_version <= kCurrentPacketVersion) {
>  			Carrier& carrier = get<Carrier>();
>  			carrier.operation_ = fr.signed_32();
> +			if (packet_version == 1) {
> +				if (carrier.operation_ == NO_OPERATION) {
> +					carrier.operation_ == INIT;

This looks like it should be =

> +				}
> +			}
>  		} else {
>  			throw UnhandledVersionError("Carrier", packet_version, kCurrentPacketVersion);
>  		}


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1786597-test-suite/+merge/352928
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1786597-test-suite into lp:widelands.


References