widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

I marked up the line with the fix.

The tiny glitch is probably the result of a complex economy and a lot harder to track down. Can you reproduce it reliably? If so, we can add the info to the bug and keep the bug open.

Diff comments:

> === modified file 'src/logic/map_objects/tribes/warehouse.cc'
> --- src/logic/map_objects/tribes/warehouse.cc	2017-02-12 09:10:57 +0000
> +++ src/logic/map_objects/tribes/warehouse.cc	2017-02-18 23:38:55 +0000
> @@ -761,11 +761,11 @@
>  			}
>  		}
>  		if (exact == Match::kCompatible) {
> -			ware = owner().tribe().get_worker_descr(ware)->becomes();
> +			worker_id = owner().tribe().get_worker_descr(worker_id)->becomes();
>  		} else {
> -			ware = INVALID_INDEX;
> +			worker_id = INVALID_INDEX;
>  		}
> -	} while (owner().tribe().has_ware(ware));

The change is here

> +	} while (owner().tribe().has_worker(worker_id));
>  
>  	return sum;
>  }


-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1664145-miners/+merge/317710
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1664145-miners into lp:widelands.