diff options
author | Philipp Sehmisch <tmw@crushnet.org> | 2006-11-29 21:27:37 +0000 |
---|---|---|
committer | Philipp Sehmisch <tmw@crushnet.org> | 2006-11-29 21:27:37 +0000 |
commit | 565a35c6ca0aa19d830cbcce0d0f522c0b854997 (patch) | |
tree | 4a8b9e5ed51e62de26b18e890a39ec89a1ce75ad | |
parent | 25df9c6c3b735fea87ded284665e866c39144705 (diff) | |
download | mana-client-565a35c6ca0aa19d830cbcce0d0f522c0b854997.tar.gz mana-client-565a35c6ca0aa19d830cbcce0d0f522c0b854997.tar.bz2 mana-client-565a35c6ca0aa19d830cbcce0d0f522c0b854997.tar.xz mana-client-565a35c6ca0aa19d830cbcce0d0f522c0b854997.zip |
Updated Makefile and CMakeList
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 10 insertions, 1 deletions
@@ -3,7 +3,8 @@ * src/resources/equipment.h: Made getSprite return a constant reference * src/resources/monsterdb.cpp, src/resources/monsterdb.h, src/resources/monsterinfo.cpp, src/resources/monsterinfo.h, - src/main.cpp: Added the MonsterDB namespace that reads the monsters.xml + src/Makefile.AM, src/CMakeLists.txt, src/main.cpp: + Added the MonsterDB namespace that reads the monsters.xml and maps monster IDs to names, sprite definitions and sound effects. * src/monster.cpp: Get sprite definition filenames from MonsterDB * src/engine.cpp: Show monster name when targeting a monster diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c663cedf..cd207dbe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -212,6 +212,10 @@ SET(SRCS resources/iteminfo.cpp resources/mapreader.cpp resources/mapreader.h + resources/monsterdb.h + resources/monsterdb.cpp + resources/monsterinfo.h + resources/monsterinfo.cpp resources/music.h resources/music.cpp resources/openglsdlimageloader.h diff --git a/src/Makefile.am b/src/Makefile.am index d9e6f907..94b0f2af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -174,6 +174,10 @@ tmw_SOURCES = graphic/imagerect.h \ resources/iteminfo.cpp \ resources/mapreader.cpp \ resources/mapreader.h \ + resources/monsterdb.h \ + resources/monsterdb.cpp \ + resources/monsterinfo.h \ + resources/monsterinfo.cpp \ resources/music.h \ resources/music.cpp \ resources/openglsdlimageloader.h \ |