diff options
author | Jared Adams <jaxad0127@gmail.com> | 2010-04-13 22:48:28 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2010-04-16 17:42:45 -0600 |
commit | 11a6f342e579c26320334b9ae9735701386e3b25 (patch) | |
tree | 5de9a3647f881a1f27f4dc31054ad086bdc86d84 /src/npc.cpp | |
parent | 9f6c1f0bd9d2ef9a3be35fee2c488d8ea6c09d6d (diff) | |
download | mana-11a6f342e579c26320334b9ae9735701386e3b25.tar.gz mana-11a6f342e579c26320334b9ae9735701386e3b25.tar.bz2 mana-11a6f342e579c26320334b9ae9735701386e3b25.tar.xz mana-11a6f342e579c26320334b9ae9735701386e3b25.zip |
Add race support for eAthena
The job/class field is used to select the race. If the given race isn't defined,
it falls back on the first race (so servers can use jobs/classes without races).
Also rename job to subtype for Being and subclasses, and begin support for
changing monster and NPC subtypes on the fly (particle effects still need to be
reset when they change).
Reviewed-by: Bertram
Diffstat (limited to 'src/npc.cpp')
-rw-r--r-- | src/npc.cpp | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/npc.cpp b/src/npc.cpp index 29a6c61c..cdfe5193 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -37,11 +37,32 @@ #include "resources/npcdb.h" -NPC::NPC(int id, int job, Map *map): - Player(id, job, map, true) +NPC::NPC(int id, int subtype, Map *map): + Player(id, subtype, map, true) { - NPCInfo info = NPCDB::get(job); + setSubtype(subtype); + setShowName(true); +} + +void NPC::setName(const std::string &name) +{ + const std::string displayName = name.substr(0, name.find('#', 0)); + + Being::setName(displayName); + + mNameColor = &userPalette->getColor(UserPalette::NPC); + + mDispName->setColor(mNameColor); +} + +void NPC::setSubtype(Uint16 subtype) +{ + Being::setSubtype(subtype); + + NPCInfo info = NPCDB::get(subtype); + + mSprites.clear(); // Setup NPC sprites for (std::list<NPCsprite*>::const_iterator i = info.sprites.begin(); i != info.sprites.end(); @@ -65,19 +86,6 @@ NPC::NPC(int id, int job, Map *map): this->controlParticle(p); } } - - setShowName(true); -} - -void NPC::setName(const std::string &name) -{ - const std::string displayName = name.substr(0, name.find('#', 0)); - - Being::setName(displayName); - - mNameColor = &userPalette->getColor(UserPalette::NPC); - - mDispName->setColor(mNameColor); } void NPC::talk() |