← Back to branch summary

~widelands-dev/widelands/workarea-fixes

« back to all changes in this revision

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

  • Committer: Nordfriese
  • Date: 2019-08-11 10:53:14 UTC
  • mfrom: (9129.1.47 trunk)
  • Revision ID: nordfriese-20190811105314-ex9xogd4cf5uwuy4
Merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/map_objects/tribes/tribe_descr.cc
203
203
                refinedlog_ = add_special_ware(table.get_string("refinedlog"));
204
204
                granite_ = add_special_ware(table.get_string("granite"));
205
205
 
 
206
                if (table.has_key<std::string>("toolbar")) {
 
207
                        toolbar_image_set_.reset(new ToolbarImageset(*table.get_table("toolbar")));
 
208
                }
206
209
        } catch (const GameDataError& e) {
207
210
                throw GameDataError("tribe %s: %s", name_.c_str(), e.what());
208
211
        }
445
448
        }
446
449
}
447
450
 
 
451
ToolbarImageset* TribeDescr::toolbar_image_set() const {
 
452
        return toolbar_image_set_.get();
 
453
}
 
454
 
448
455
/**
449
456
 * Helper functions
450
457
 */