widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Diff comments:

> === modified file 'src/logic/map_objects/tribes/bill_of_materials.h'
> --- src/logic/map_objects/tribes/bill_of_materials.h	2015-12-11 19:06:50 +0000
> +++ src/logic/map_objects/tribes/bill_of_materials.h	2016-02-04 17:53:17 +0000
> @@ -25,7 +25,7 @@
>  #include "logic/widelands.h"
>  
>  namespace Widelands {
> -using WareAmount = std::pair<DescriptionIndex, uint8_t>;
> +using WareAmount = std::pair<DescriptionIndex, uint32_t>;

We have a whole bunch of them e.g. in lua_map:

using SoldiersMap = std::map<SoldierMapDescr, uint32_t>;
using WaresMap = std::map<Widelands::DescriptionIndex, uint32_t>;
using WorkersMap = std::map<Widelands::DescriptionIndex, uint32_t>;
using SoldierAmount = std::pair<SoldierMapDescr, uint32_t>;
using WorkerAmount = std::pair<Widelands::DescriptionIndex, uint32_t>;
using PlrInfluence = std::pair<uint8_t, uint32_t>;

So, I think this is something we could cleanup some other time? If you think cleaning this up is important for build19, I can do so.

>  using BillOfMaterials = std::vector<WareAmount>;
>  
>  // range structure for iterating ware range with index


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