summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 390456a0..4b8e5f74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 \