widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_ware_amount into lp:widelands.

Commit message:
Changed amount in WareAmount from uint8_t to uint32_t.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_ware_amount/+merge/285099

The amount in WareAmount was too small - I messed this up during a data type cleanup. The savegames already use 32 bit, so this should be fine.

The bug was reported on the forums: https://wl.widelands.org/forum/topic/1925/?page=2#post-16407
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_ware_amount into lp:widelands.

=== 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>;
 using BillOfMaterials = std::vector<WareAmount>;
 
 // range structure for iterating ware range with index