diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-05-21 21:44:27 +0000 |
|---|---|---|
| committer | Philipp Sehmisch <tmw@crushnet.org> | 2008-05-21 21:44:27 +0000 |
| commit | 0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd (patch) | |
| tree | 6b2a208fac407cf5cf4ddcab2c5e1ebc2b9723dc /src/main.cpp | |
| parent | 0c869fc47a30616967cb8b69af9ec772566d7076 (diff) | |
| download | mana-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.gz mana-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.bz2 mana-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.tar.xz mana-0ac3b58c4c5079f22e6bf4b0efba7f5fe99565cd.zip | |
Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line
Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs.
........
r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line
misspelled filename
........
r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines
Added XML::Document class which simplifies parsing an XML document and
automatically cleans it up again.
........
r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines
Fixed svn:keywords properties and added header to guild.h.
........
r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line
Added the possibility to add particle effects to NPCs in npcs.xml.
........
r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line
fixed some filename confusion messup in the last commit.
........
NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 01250594..db9f85ac 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -78,6 +78,7 @@ #include "resources/image.h" #include "resources/itemdb.h" #include "resources/monsterdb.h" +#include "resources/npcdb.h" #include "resources/resourcemanager.h" #include "utils/dtor.h" @@ -357,6 +358,7 @@ void exit_engine() // Unload XML databases ItemDB::unload(); MonsterDB::unload(); + NPCDB::unload(); ResourceManager::deleteInstance(); delete logger; @@ -742,6 +744,7 @@ int main(int argc, char *argv[]) // Load XML databases ItemDB::load(); MonsterDB::load(); + NPCDB::load(); state = LOGIN_STATE; break; |