summaryrefslogtreecommitdiff
path: root/src/Makefile.am
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/Makefile.am
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/Makefile.am')
-rw-r--r--src/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a54bb5c8..5c519832 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -131,7 +131,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
gui/speechbubble.h \
gui/status.cpp \
gui/status.h \
- gui/table.h \
gui/table.cpp \
gui/table.h \
gui/table_model.cpp \
@@ -200,6 +199,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \
resources/colordb.h \
resources/dye.cpp \
resources/dye.h \
+ resources/emotedb.cpp \
+ resources/emotedb.h \
resources/image.cpp \
resources/image.h \
resources/imageloader.cpp \