1 files changed, 29 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b38b496..9e4d43e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -348,6 +348,8 @@ SET(SRCS
     resources/ambientoverlay.h
     resources/animation.cpp
     resources/animation.h
+    resources/beinginfo.cpp
+    resources/beinginfo.h
     resources/colordb.cpp
     resources/colordb.h
     resources/dye.cpp
@@ -370,8 +372,6 @@ SET(SRCS
     resources/mapreader.h
     resources/monsterdb.cpp
     resources/monsterdb.h
-    resources/monsterinfo.cpp
-    resources/monsterinfo.h
     resources/music.cpp
     resources/music.h
     resources/npcdb.cpp
@@ -382,6 +382,8 @@ SET(SRCS
     resources/resourcemanager.h
     resources/soundeffect.h
     resources/soundeffect.cpp
+    resources/specialdb.cpp
+    resources/specialdb.h
     resources/spritedef.h
     resources/spritedef.cpp
     resources/wallpaper.cpp
@@ -402,6 +404,13 @@ SET(SRCS
     utils/mkdir.h
     utils/xml.cpp
     utils/xml.h
+    actor.cpp
+    actor.h
+    actorsprite.cpp
+    actorsprite.h
+    actorspritelistener.h
+    actorspritemanager.cpp
+    actorspritemanager.h
     animatedsprite.cpp
     animatedsprite.h
     animationparticle.cpp
@@ -410,8 +419,8 @@ SET(SRCS
     avatar.h
     being.cpp
     being.h
-    beingmanager.cpp
-    beingmanager.h
+    chatlog.cpp
+    chatlog.h
     client.cpp
     client.h
     channel.cpp
@@ -420,18 +429,24 @@ SET(SRCS
     channelmanager.h
     commandhandler.cpp
     commandhandler.h
+    compoundsprite.cpp
+    compoundsprite.h
     configlistener.h
     configuration.cpp
     configuration.h
+    defaults.cpp
+    defaults.h
     effectmanager.cpp
     effectmanager.h
     emoteshortcut.cpp
     emoteshortcut.h
     equipment.h
+    event.cpp
+    event.h
+    eventmanager.cpp
+    eventmanager.h
     flooritem.cpp
     flooritem.h
-    flooritemmanager.cpp
-    flooritemmanager.h
     game.cpp
     game.h
     graphics.cpp
@@ -441,6 +456,8 @@ SET(SRCS
     guild.h
     imageparticle.cpp
     imageparticle.h
+    imagesprite.cpp
+    imagesprite.h
     inventory.cpp
     inventory.h
     item.cpp
@@ -451,6 +468,8 @@ SET(SRCS
     joystick.h
     keyboardconfig.cpp
     keyboardconfig.h
+    listener.cpp
+    listener.h
     localplayer.cpp
     localplayer.h
     log.cpp
@@ -459,10 +478,6 @@ SET(SRCS
     main.h
     map.cpp
     map.h
-    monster.cpp
-    monster.h
-    npc.cpp
-    npc.h
     openglgraphics.cpp
     openglgraphics.h
     particle.cpp
@@ -474,8 +489,8 @@ SET(SRCS
     particleemitterprop.h
     party.cpp
     party.h
-    player.cpp
-    player.h
+    playerinfo.cpp
+    playerinfo.h
     playerrelations.cpp
     playerrelations.h
     position.cpp
@@ -502,6 +517,7 @@ SET(SRCS
     tileset.h
     units.cpp
     units.h
+    variabledata.h
     vector.cpp
     vector.h
     )
@@ -568,6 +584,7 @@ SET(SRCS_MANA
     net/manaserv/chathandler.h
     net/manaserv/connection.cpp
     net/manaserv/connection.h
+    net/manaserv/defines.h
     net/manaserv/effecthandler.cpp
     net/manaserv/effecthandler.h
     net/manaserv/gamehandler.cpp