summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-03-31 23:26:10 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-03-31 23:26:10 +0000
commit4c31dc05aee90e3ba5f130ca3e77671277d3bb56 (patch)
treecfe55ef3cc748939cb9dfb4c23a0203c4baa356c
parent677b0233137e9f5a2b6854d360ff8f72b1ac2b21 (diff)
downloadmana-client-4c31dc05aee90e3ba5f130ca3e77671277d3bb56.tar.gz
mana-client-4c31dc05aee90e3ba5f130ca3e77671277d3bb56.tar.bz2
mana-client-4c31dc05aee90e3ba5f130ca3e77671277d3bb56.tar.xz
mana-client-4c31dc05aee90e3ba5f130ca3e77671277d3bb56.zip
updated project flies
-rw-r--r--ChangeLog6
-rw-r--r--src/Makefile.am4
-rw-r--r--tmw.cbp4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d03a2b3e..e298e7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
2008-03-31 Philipp Sehmisch <tmw@crushnet.org>
* src/main.cpp, src/npc.cpp, src/npc.h, src/resources/npcdb.h,
- src/resources/npcdb.cpp, data/npcs.xml: Implemented NPC XML database
- which maps NPC IDs to one or more animation files and thus enables
- animated NPCs.
+ src/resources/npcdb.cpp, data/npcs.xml, src/Makefile.am, tmc.cbp:
+ Implemented NPC XML database which maps NPC IDs to one or more
+ animation files and thus enables animated NPCs.
* data/graphics/sprites/npc-test.png, data/graphics/sprites/npc-test.xml,
data/graphics/sprites/npc-treasurebox.png,
data/graphics/sprites/npc-treasurebox.xml: Added some animated NPCs by #
diff --git a/src/Makefile.am b/src/Makefile.am
index d7f0537c..d9b3fc8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -234,6 +234,8 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
resources/monsterinfo.cpp \
resources/music.h \
resources/music.cpp \
+ resources/npcdb.h \
+ resources/npcdb.cpp \
resources/resource.cpp \
resources/resource.h \
resources/resourcemanager.cpp \
@@ -338,4 +340,4 @@ tmw_SOURCES = gui/widgets/dropdown.cpp \
INCLUDES = \
$(all_includes) \
-DTMW_DATADIR=\""$(pkgdatadir)/"\" \
- -DLOCALEDIR=\""$(localedir)"\"
+ -DLOCALEDIR=\""$(localedir)"\" \ No newline at end of file
diff --git a/tmw.cbp b/tmw.cbp
index 1255df04..4b508fbf 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -666,6 +666,10 @@
<Unit filename="src/resources/music.cpp" />
<Unit filename="src/resources/music.h">
<Option target="default" />
+ </Unit>
+ <Unit filename="src/resources/npcdb.cpp" />
+ <Unit filename="src/resources/npcdb.h">
+ <Option target="default" />
</Unit>
<Unit filename="src/resources/resource.cpp" />
<Unit filename="src/resources/resource.h">