widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Thanks for the review :)

I will wait with merging until you have done your testing.

Diff comments:

> 
> === modified file 'src/map_io/s2map.cc'
> --- src/map_io/s2map.cc	2017-01-25 18:55:59 +0000
> +++ src/map_io/s2map.cc	2017-08-11 11:40:48 +0000
> @@ -1074,7 +1071,6 @@
>  				}
>  			} while (mr.advance(map_) && !fixed);
>  			if (!fixed) {
> -				++num_failed;

I think that mr.advance will iterate over all matches, we only need 1 match though. The bool is also used for the log message, so let's just leave it in.

>  				log("FAILED! No alternative port buildspace for (%i, %i) found!\n", fc.x, fc.y);
>  			} else
>  				log("Fixed!\n");


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-986611-cppcheck-minimal/+merge/328910
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-986611-cppcheck-minimal.