← Back to branch summary

~qcumber-some/widelands/spice-up-cmake

« back to all changes in this revision

Viewing changes to src/logic/item_ware_descr.cc

  • Committer: Jens Beyer (Qcumber-some)
  • Date: 2010-05-28 14:51:37 UTC
  • mfrom: (5149.1.226 trunk)
  • Revision ID: qcumber-some@buerotiger.de-20100528145137-0pyil9qw7szyztsw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/item_ware_descr.cc
26
26
namespace Widelands {
27
27
 
28
28
Item_Ware_Descr::Item_Ware_Descr
29
 
        (char const * const _name, char const * const _descname,
 
29
        (const Tribe_Descr & tribe, char const * const _name, char const * const _descname,
30
30
         std::string const & directory, Profile & prof, Section & global_s)
31
31
        :
32
32
        Map_Object_Descr(_name, _descname),
 
33
        m_tribe(tribe),
33
34
        m_helptext      (global_s.get_string("help", "")),
34
35
        m_icon_fname(directory + "/menu.png"),
35
36
        m_icon(g_gr->get_picture(PicMod_UI, "pics/but0.png"))