summaryrefslogtreecommitdiff
path: root/src/npc.cpp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-15 19:48:00 -0700
committerIra Rice <irarice@gmail.com>2009-01-15 19:48:00 -0700
commit0a18932056e2a72f41cdd14c831344ad80cfb35b (patch)
tree9b3592df7749831be8d3e8bd5a8c04f6d1217c90 /src/npc.cpp
parent731dcee8bec7e32d576b0e6a9d98b9a21050362e (diff)
downloadmana-client-0a18932056e2a72f41cdd14c831344ad80cfb35b.tar.gz
mana-client-0a18932056e2a72f41cdd14c831344ad80cfb35b.tar.bz2
mana-client-0a18932056e2a72f41cdd14c831344ad80cfb35b.tar.xz
mana-client-0a18932056e2a72f41cdd14c831344ad80cfb35b.zip
Added emote database, which is loosely based off of the NPC database.
Also changed all emotes to be animated sprites now, and to load from emotes.xml. This gives us a bit more flexibility to not only add more emotes in the future, but allowing them to be animated as well. NOTE: This commit, unlike the previous emote commits, breaks emotes if you don't have the xml file. This will be available on Aethyra soon, but is not rolled into an update at the moment. Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/npc.cpp')
-rw-r--r--src/npc.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/npc.cpp b/src/npc.cpp
index a2fb7d38..a9aa216c 100644
--- a/src/npc.cpp
+++ b/src/npc.cpp
@@ -105,8 +105,7 @@ void NPC::setSprite(int slot, int id, std::string color)
Being::setSprite(slot, id, color);
}
-Being::Type
-NPC::getType() const
+Being::Type NPC::getType() const
{
return Being::NPC;
}