[FIX] Member variables now use m_ prefix

[FIX] Lots of minor fixes

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

1 files changed, 56 insertions, 61 deletions

diff --git a/pokemod/MapEffect.h b/pokemod/MapEffect.h
index 36ef60b8..d72087b7 100644
--- a/pokemod/MapEffect.h
+++ b/pokemod/MapEffect.h
@@ -1,37 +1,36 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        pokemod/MapEffect.h
-// Purpose:     Define an effect on a map
-// Author:      Ben Boeckel
-// Modified by: Ben Boeckel
-// Created:     Fri June 1 2007 19:57:47
-// Copyright:   ©2007-2008 Ben Boeckel and Nerdy Productions
-// Licence:
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License along
-//    with this program.  If not, see <http://www.gnu.org/licenses/>.
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * Copyright 2007-2008 Ben Boeckel <MathStuf@gmail.com>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef __POKEMOD_MAPEFFECT__
 #define __POKEMOD_MAPEFFECT__
 
+// Qt includes
 #include <QString>
 #include <QStringList>
 
+// General includes
 #include <Exception.h>
 #include <Flag.h>
 #include <Point.h>
 
+// Pokemod includes
 #include "Object.h"
 
+// Forward declarations
 class Pokemod;
 
 class MapEffect : public Object
@@ -60,56 +59,52 @@ class MapEffect : public Object
         };
         static const QStringList PCTypeStr;
         
-        MapEffect(const Pokemod* par, const int _id);
-        MapEffect(const Pokemod* par, const MapEffect& e, const int _id);
-        MapEffect(const Pokemod* par, const QString& fname, const int _id = -1);
+        MapEffect(const Pokemod* pokemod, const int id);
+        MapEffect(const Pokemod* pokemod, const MapEffect& effect, const int id);
+        MapEffect(const Pokemod* pokemod, const QString& fileName, const int id = INT_MAX);
         
-        void load(const QString& fname, const int _id = -1) throw(Exception);
+        void load(const QString& fileName, int id = INT_MAX) throw(Exception);
         void save(const QString& map) const throw(Exception);
         
-        void setName(const QString& n);
+        void setName(const QString& name);
         void setCoordinate(const int x, const int y);
-        void setCoordinateX(const int x);
-        void setCoordinateY(const int y);
-        void setExistFlag(const int f, const int s);
-        void setExistFlagFlag(const int f);
-        void setExistFlagStatus(const int s);
-        void setSkin(const QString& s) throw(Exception);
-        void setEffect(const int e) throw(BoundsException);
-        void setVal1(const int v1) throw(UnusedException);
-        void setVal2(const int v2) throw(Exception);
-        void setDirection(const int d) throw(BoundsException);
-        void setIsGhost(const bool i);
-        void setCanMove(const bool c);
-        void setDialog(const int d) throw(BoundsException);
+        void setExistFlag(const int flag, const int status);
+        void setSkin(const QString& skin) throw(Exception);
+        void setEffect(const int effect) throw(BoundsException);
+        void setValue1(const int value1) throw(UnusedException);
+        void setValue2(const int value2) throw(Exception);
+        void setDirection(const int direction) throw(BoundsException);
+        void setIsGhost(const bool isGhost);
+        void setCanMove(const bool canMove);
+        void setDialog(const int dialog) throw(BoundsException);
         
-        QString getName() const;
-        Point getCoordinate() const;
-        Flag getExistFlag() const;
-        QString getSkin() const;
-        int getEffect() const;
-        int getVal1() const;
-        int getVal2() const;
-        int getDirection() const;
-        bool getIsGhost() const;
-        bool getCanMove() const;
-        int getDialog() const;
+        QString name() const;
+        Point coordinate() const;
+        Flag existFlag() const;
+        QString skin() const;
+        int effect() const;
+        int value1() const;
+        int value2() const;
+        int direction() const;
+        bool isGhost() const;
+        bool canMove() const;
+        int dialog() const;
         
         MapEffect& operator=(const MapEffect& rhs);
     private:
         bool validate() const;
         
-        QString name;
-        Point coordinate;
-        Flag existFlag;
-        QString skin;
-        int effect;
-        int val1;
-        int val2;
-        int direction;
-        bool isGhost;
-        bool canMove;
-        int dialog;
+        QString m_name;
+        Point m_coordinate;
+        Flag m_existFlag;
+        QString m_skin;
+        int m_effect;
+        int m_value1;
+        int m_value2;
+        int m_direction;
+        bool m_isGhost;
+        bool m_canMove;
+        int m_dialog;
 };
 
 #endif