summaryrefslogtreecommitdiff
path: root/src/npc.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-08-13 10:31:23 -0600
committerJared Adams <jaxad0127@gmail.com>2009-08-13 17:33:08 -0600
commitbe85ca9d91ff867faf140328d0bcbb2062b58cdf (patch)
treeb9bf367d9e655b36acf764a8e0260f6912d14b0b /src/npc.cpp
parent0c9ee8a74e62fe65acb551370db07ca568e3a0b3 (diff)
downloadmana-client-be85ca9d91ff867faf140328d0bcbb2062b58cdf.tar.gz
mana-client-be85ca9d91ff867faf140328d0bcbb2062b58cdf.tar.bz2
mana-client-be85ca9d91ff867faf140328d0bcbb2062b58cdf.tar.xz
mana-client-be85ca9d91ff867faf140328d0bcbb2062b58cdf.zip
Make NPC inherit from Being instead of Player
No need for NPCs to inherit from Player. Player has functions NPC doesn't need and overrides that NPC doesn't need. This change reduces the number of functions needed to be overrided by NPC.
Diffstat (limited to 'src/npc.cpp')
-rw-r--r--src/npc.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/npc.cpp b/src/npc.cpp
index a49ef406..f7172d4b 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -36,7 +36,7 @@ bool NPC::isTalking = false;
int current_npc = 0;
NPC::NPC(int id, int job, Map *map):
- Player(id, job, map)
+ Being(id, job, map)
{
NPCInfo info = NPCDB::get(job);
@@ -89,17 +89,6 @@ void NPC::setName(const std::string &name)
Being::setName(displayName + " (NPC)");
}
-void NPC::setGender(Gender gender)
-{
- Being::setGender(gender);
-}
-
-void NPC::setSprite(int slot, int id, std::string color)
-{
- // Fix this later should it not be adequate enough.
- Being::setSprite(slot, id, color);
-}
-
Being::Type NPC::getType() const
{
return Being::NPC;