diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-07-19 15:12:06 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-07-19 15:12:06 +0000 |
| commit | 4050f8c0bced625a95d542d30647c3f8bbf2267b (patch) | |
| tree | 420d65a5ed6a2155762b4e13a4c90ab2df9f888e /src/engine.cpp | |
| parent | da3a1fd114dd7b8e5e8c880bd987506acc16ac42 (diff) | |
| download | mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.gz mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.bz2 mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.tar.xz mana-4050f8c0bced625a95d542d30647c3f8bbf2267b.zip | |
Merged new_animation branch until r2415 into trunk.
Diffstat (limited to 'src/engine.cpp')
| -rw-r--r-- | src/engine.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 724c0930..ba28fcc9 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -25,6 +25,7 @@ #include <list> +#include "animation.h" #include "being.h" #include "beingmanager.h" #include "flooritemmanager.h" @@ -57,14 +58,13 @@ extern Minimap *minimap; char itemCurrenyQ[10] = "0"; int camera_x, camera_y; -std::map<int, Spriteset*> monsterset; - ItemManager *itemDb; /**< Item database object */ Spriteset *itemset; Spriteset *emotionset; Spriteset *npcset; std::vector<Spriteset *> weaponset; +AnimatedSprite *animatedSprite; Engine::Engine(Network *network): @@ -102,9 +102,6 @@ Engine::Engine(Network *network): Engine::~Engine() { // Delete sprite sets - for_each(monsterset.begin(), monsterset.end(), make_dtor(monsterset)); - monsterset.clear(); - delete npcset; delete emotionset; for_each(weaponset.begin(), weaponset.end(), make_dtor(weaponset)); @@ -112,6 +109,8 @@ Engine::~Engine() delete itemset; delete itemDb; + + delete animatedSprite; } void Engine::changeMap(const std::string &mapPath) |