← Back to branch summary

~ubuntu-branches/ubuntu/maverick/lordsawar/maverick

« back to all changes in this revision

Viewing changes to src/citysetlist.h

  • Committer: Bazaar Package Importer
  • Author(s): Barry deFreese
  • Date: 2010-04-10 09:29:33 UTC
  • mfrom: (1.1.9 upstream) (5.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100410092933-23uq4dxig30kmtcw
Tags: 0.1.8-1
* New upstream release.
* Add misc:Depends for -data package.
* Bump Standards Version to 3.8.4. (No changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/citysetlist.h
70
70
         *             This value does not contain any slashes, and is
71
71
         *             presumed to be found inside the citysets/ directory.
72
72
         */
73
 
        Cityset *getCityset(std::string dir) { return d_citysets[dir];}
 
73
        Cityset *getCityset(std::string dir);
74
74
 
75
75
        //! Return the Cityset object by the id.
76
76
        /**
77
77
         * @param id   A unique numeric identifier that identifies the cityset
78
78
         *             among all tilesets in the citysetlist.
79
79
         */
80
 
        Cityset *getCityset(guint32 id) { return d_citysetids[id];};
 
80
        Cityset *getCityset(guint32 id);
 
81
 
 
82
        void add(Cityset *cityset);
 
83
        void instantiateImages();
 
84
        void uninstantiateImages();
 
85
 
 
86
        bool addToPersonalCollection(Cityset *cityset, std::string &new_subdir, guint32 &new_id);
 
87
 
 
88
        static int getNextAvailableId(int after = 0);
81
89
    private:
82
90
        //! Default constructor.  Loads all citysets it can find.
83
91
        /**
96
104
         * @param name  The name of the subdirectory that the Cityset resides 
97
105
         *              in.
98
106
         *
99
 
         * @return True if the Cityset could be loaded.  False otherwise.
 
107
         * @return the Cityset.  NULL otherwise.
100
108
         */
101
 
        bool loadCityset (std::string name, bool p);
102
 
        void loadCitysets (std::list<std::string> name, bool p);
 
109
        Cityset* loadCityset (std::string name);
 
110
        void loadCitysets (std::list<std::string> name);
103
111
        
104
112
        typedef std::map<std::string, std::string> DirMap;
105
113
        typedef std::map<std::string, Cityset*> CitysetMap;