← Back to branch summary

~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/ware_descr.h

  • Committer: fios at foramnagaidhlig
  • Date: 2015-10-21 16:43:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7582.
  • Revision ID: fios@foramnagaidhlig.net-20151021164330-zu1cmjg77ypogb48
Menu icon graphics are now a property of MapObject and loaded on demand.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/logic/ware_descr.h
64
64
 
65
65
        std::string directory() const {return directory_;}
66
66
 
67
 
        /// \return index to ware's icon inside picture stack
68
 
        const Image* icon() const {return icon_;}
69
 
        std::string icon_name() const {return icon_fname_;}
70
 
 
71
 
        void load_graphics();
72
 
 
73
67
        bool has_demand_check(const std::string& tribename) const;
74
68
 
75
69
        /// Called when a demand check for this ware type is encountered during
97
91
        std::set<BuildingIndex> producers_; // Buildings that produce this ware
98
92
 
99
93
        std::string  directory_;  /// The directory where the init files are located
100
 
        std::string  icon_fname_; ///< Filename of ware's main picture
101
 
        const Image* icon_;       ///< Index of ware's picture in picture stack
102
94
        DISALLOW_COPY_AND_ASSIGN(WareDescr);
103
95
};
104
96