[FIX] Only committed general last time

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@55 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 51 insertions, 51 deletions

diff --git a/pokemod/Map.h b/pokemod/Map.h
index 24371003..03a3c4e3 100644
--- a/pokemod/Map.h
+++ b/pokemod/Map.h
@@ -48,89 +48,89 @@ class Map : public Object
         };
         static const QStringList TypeStr;
         
-        Map(const Pokemod& par, const unsigned _id);
-        Map(const Pokemod& par, const Map& m, const unsigned _id);
-        Map(const Pokemod& par, const QString& fname, const unsigned _id = UINT_MAX);
+        Map(const Pokemod& par, const int _id);
+        Map(const Pokemod& par, const Map& m, const int _id);
+        Map(const Pokemod& par, const QString& fname, const int _id = -1);
         
-        void load(const QString& fname, const unsigned _id = UINT_MAX) throw(Exception);
+        void load(const QString& fname, const int _id = -1) throw(Exception);
         void save() const throw(Exception);
         
         void setName(const QString& n);
-        void setFlyWarp(const unsigned f) throw(BoundsException);
-        void setType(const unsigned t) throw(BoundsException);
+        void setFlyWarp(const int f) throw(BoundsException);
+        void setType(const int t) throw(BoundsException);
         
         QString getName() const;
-        unsigned getFlyWarp() const;
-        unsigned getType() const;
+        int getFlyWarp() const;
+        int getType() const;
         
-        void setTile(unsigned x, unsigned y, unsigned _id) throw(BoundsException);
-        void insertColumn(unsigned x);
-        void insertRow(unsigned y);
+        void setTile(int x, int y, int _id) throw(BoundsException);
+        void insertColumn(int x);
+        void insertRow(int y);
         void addColumn();
         void addRow();
-        void deleteColumn(unsigned x);
-        void deleteRow(unsigned y);
+        void deleteColumn(int x);
+        void deleteRow(int y);
         
-        unsigned getTile(unsigned x, unsigned y) const;
-        unsigned getWidth() const;
-        unsigned getHeight() const;
+        int getTile(int x, int y) const;
+        int getWidth() const;
+        int getHeight() const;
         
-        const MapEffect& getEffect(const unsigned i) const throw(IndexException);
-        MapEffect& getEffect(const unsigned i) throw(IndexException);
-        const MapEffect& getEffectByID(const unsigned i) const throw(IndexException);
-        MapEffect& getEffectByID(const unsigned i) throw(IndexException);
-        unsigned getEffectIndex(const unsigned _id) const;
-        unsigned getEffectCount() const;
+        const MapEffect& getEffect(const int i) const throw(IndexException);
+        MapEffect& getEffect(const int i) throw(IndexException);
+        const MapEffect& getEffectByID(const int i) const throw(IndexException);
+        MapEffect& getEffectByID(const int i) throw(IndexException);
+        int getEffectIndex(const int _id) const;
+        int getEffectCount() const;
         MapEffect& newEffect();
         MapEffect& newEffect(const QString& fname);
         MapEffect& newEffect(const MapEffect& e);
-        void deleteEffect(const unsigned i) throw(IndexException);
+        void deleteEffect(const int i) throw(IndexException);
         
-        const MapTrainer& getTrainer(const unsigned i) const throw(IndexException);
-        MapTrainer& getTrainer(const unsigned i) throw(IndexException);
-        const MapTrainer& getTrainerByID(const unsigned i) const throw(IndexException);
-        MapTrainer& getTrainerByID(const unsigned i) throw(IndexException);
-        unsigned getTrainerIndex(const unsigned _id) const;
-        unsigned getTrainerCount() const;
+        const MapTrainer& getTrainer(const int i) const throw(IndexException);
+        MapTrainer& getTrainer(const int i) throw(IndexException);
+        const MapTrainer& getTrainerByID(const int i) const throw(IndexException);
+        MapTrainer& getTrainerByID(const int i) throw(IndexException);
+        int getTrainerIndex(const int _id) const;
+        int getTrainerCount() const;
         MapTrainer& newTrainer();
         MapTrainer& newTrainer(const QString& fname);
         MapTrainer& newTrainer(const MapTrainer& t);
-        void deleteTrainer(const unsigned i) throw(IndexException);
+        void deleteTrainer(const int i) throw(IndexException);
         
-        const MapWarp& getWarp(const unsigned i) const throw(IndexException);
-        MapWarp& getWarp(const unsigned i) throw(IndexException);
-        const MapWarp& getWarpByID(const unsigned i) const throw(IndexException);
-        MapWarp& getWarpByID(const unsigned i) throw(IndexException);
-        unsigned getWarpIndex(const unsigned _id) const;
-        unsigned getWarpCount() const;
+        const MapWarp& getWarp(const int i) const throw(IndexException);
+        MapWarp& getWarp(const int i) throw(IndexException);
+        const MapWarp& getWarpByID(const int i) const throw(IndexException);
+        MapWarp& getWarpByID(const int i) throw(IndexException);
+        int getWarpIndex(const int _id) const;
+        int getWarpCount() const;
         MapWarp& newWarp();
         MapWarp& newWarp(const QString& fname);
         MapWarp& newWarp(const MapWarp& w);
-        void deleteWarp(const unsigned i) throw(IndexException);
+        void deleteWarp(const int i) throw(IndexException);
         
-        const MapWildList& getWildList(const unsigned i) const throw(IndexException);
-        MapWildList& getWildList(const unsigned i) throw(IndexException);
-        const MapWildList& getWildListByID(const unsigned i) const throw(IndexException);
-        MapWildList& getWildListByID(const unsigned i) throw(IndexException);
-        unsigned getWildListIndex(const unsigned _id) const;
-        unsigned getWildListCount() const;
+        const MapWildList& getWildList(const int i) const throw(IndexException);
+        MapWildList& getWildList(const int i) throw(IndexException);
+        const MapWildList& getWildListByID(const int i) const throw(IndexException);
+        MapWildList& getWildListByID(const int i) throw(IndexException);
+        int getWildListIndex(const int _id) const;
+        int getWildListCount() const;
         MapWildList& newWildList();
         MapWildList& newWildList(const QString& fname);
         MapWildList& newWildList(const MapWildList& w);
-        void deleteWildList(const unsigned i) throw(IndexException);
+        void deleteWildList(const int i) throw(IndexException);
         
         Map& operator=(const Map& rhs);
     private:
         bool validate() const;
-        unsigned getNewEffectId() const;
-        unsigned getNewTrainerId() const;
-        unsigned getNewWarpId() const;
-        unsigned getNewWildListId() const;
+        int getNewEffectId() const;
+        int getNewTrainerId() const;
+        int getNewWarpId() const;
+        int getNewWildListId() const;
         
         QString name;
-        unsigned flyWarp;
-        unsigned type;
-        Matrix<unsigned> tiles;
+        int flyWarp;
+        int type;
+        Matrix<int> tiles;
         
         QList<MapEffect> effects;
         QList<MapTrainer> trainers;