summaryrefslogtreecommitdiff
path: root/src/game-server/monster.hpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-02 22:46:30 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-02 22:46:30 +0100
commitbfdc59942a39661eac1a72e80f25fe9e039e4e50 (patch)
treec87a4d79d483197192407c46b4585c61946c7ddf /src/game-server/monster.hpp
parent63ff01f1d53f2c362beb60fdba664efe19593131 (diff)
downloadmanaserv-bfdc59942a39661eac1a72e80f25fe9e039e4e50.tar.gz
manaserv-bfdc59942a39661eac1a72e80f25fe9e039e4e50.tar.bz2
manaserv-bfdc59942a39661eac1a72e80f25fe9e039e4e50.tar.xz
manaserv-bfdc59942a39661eac1a72e80f25fe9e039e4e50.zip
Some random code cleanups.
Also renamed MonsterClass::getType() to getId() since it was misleading with the use of ThingType::getType() and didn't represent the actual meaning, IMHO. Trivial.
Diffstat (limited to 'src/game-server/monster.hpp')
-rw-r--r--src/game-server/monster.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game-server/monster.hpp b/src/game-server/monster.hpp
index b25e9c17..2c4d59e2 100644
--- a/src/game-server/monster.hpp
+++ b/src/game-server/monster.hpp
@@ -69,7 +69,7 @@ class MonsterClass
{
public:
MonsterClass(int id):
- mID(id),
+ mId(id),
mSpeed(1),
mSize(16),
mExp(-1),
@@ -83,10 +83,10 @@ class MonsterClass
{}
/**
- * Returns monster type. This is the ID of the monster class.
+ * Returns monster type. This is the Id of the monster class.
*/
- int getType() const
- { return mID; }
+ int getId() const
+ { return mId; }
/**
* Sets monster drops. These are the items the monster drops when it
@@ -186,7 +186,7 @@ class MonsterClass
ItemClass *getRandomDrop() const;
private:
- unsigned short mID;
+ unsigned short mId;
MonsterDrops mDrops;
std::map<int, double> mAttributes; /**< Base attributes of the monster. */
float mSpeed; /**< The monster class speed in tiles per second */