widelands

Merge lp:~widelands-dev/widelands/fix_ware_amount into lp:widelands

  1. fix_ware_amount
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7788
Proposed branch: lp:~widelands-dev/widelands/fix_ware_amount
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
src/logic/map_objects/tribes/bill_of_materials.h (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix_ware_amount
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+285099@code.launchpad.net

Commit message

Changed amount in WareAmount from uint8_t to uint32_t.

Description of the change

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

To post a comment you must log in.
Revision history for this message
SirVer (sirver) :
review: Approve
Revision history for this message
GunChleoc (gunchleoc) :
Revision history for this message
SirVer (sirver) wrote :

no, not that important.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/logic/map_objects/tribes/bill_of_materials.h'
2--- src/logic/map_objects/tribes/bill_of_materials.h 2015-12-11 19:06:50 +0000
3+++ src/logic/map_objects/tribes/bill_of_materials.h 2016-02-04 17:53:17 +0000
4@@ -25,7 +25,7 @@
5 #include "logic/widelands.h"
6
7 namespace Widelands {
8-using WareAmount = std::pair<DescriptionIndex, uint8_t>;
9+using WareAmount = std::pair<DescriptionIndex, uint32_t>;
10 using BillOfMaterials = std::vector<WareAmount>;
11
12 // range structure for iterating ware range with index

Subscribers

People subscribed via source and target branches

to status/vote changes: