← Back to branch summary

~widelands-dev/widelands/note_create_object2

« back to all changes in this revision

Viewing changes to src/logic/map_objects/tribes/market.cc

  • Committer: GunChleoc
  • Date: 2019-03-01 09:01:34 UTC
  • Revision ID: fios@foramnagaidhlig.net-20190301090134-ebjs5hry214iaqgc
NOCOM

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/map_objects/tribes/market.cc
185
185
                        // Give the carrier a ware.
186
186
                        WareInstance* ware =
187
187
                           new WareInstance(item_pair.first, game->tribes().get_ware_descr(item_pair.first));
188
 
                        ware->init(*game);
 
188
                        ware->init(game->objects());
189
189
                        carrier->set_carried_ware(*game, ware);
190
190
 
191
191
                        // We have to remove this item from our economy. Otherwise it would be
235
235
        auto& trade_order = trade_orders_.at(trade_id);
236
236
 
237
237
        WareInstance* ware = new WareInstance(ware_index, game->tribes().get_ware_descr(ware_index));
238
 
        ware->init(*game);
 
238
        ware->init(game->objects());
239
239
 
240
240
        // TODO(sirver,trading): This is a hack. We should have a worker that
241
241
        // carriers stuff out. At the moment this assumes this market is barbarians