widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #00477
[Merge] lp:~borim/widelands/economyChart into lp:widelands
Borim has proposed merging lp:~borim/widelands/economyChart into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~borim/widelands/economyChart/+merge/82038
tracking the ware consumption, when creating little guys in warehouses
--
https://code.launchpad.net/~borim/widelands/economyChart/+merge/82038
Your team Widelands Developers is requested to review the proposed merge of lp:~borim/widelands/economyChart into lp:widelands.
=== modified file 'src/logic/warehouse.cc'
--- src/logic/warehouse.cc 2011-11-01 10:20:27 +0000
+++ src/logic/warehouse.cc 2011-11-11 23:43:26 +0000
@@ -926,9 +926,11 @@
Worker_Descr::Buildcost const & buildcost = w_desc.buildcost();
container_iterate_const(Worker_Descr::Buildcost, buildcost, i) {
std::string const & input = i.current->first;
- if (Ware_Index const id_ware = tribe().ware_index(input))
+ if (Ware_Index const id_ware = tribe().ware_index(input)) {
remove_wares (id_ware, i.current->second);
- else
+ //update statistic accordingly
+ owner().ware_consumed(id_ware, i.current->second);
+ } else
remove_workers(tribe().safe_worker_index(input), i.current->second);
}
Follow ups