don't remove trampolines twice

SVN-Revision: 1288

diff --git a/src/world.cpp b/src/world.cpp
index 11bc77c..46ff60a 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -129,17 +129,10 @@ World::apply_bonuses()
 
 World::~World()
 {
-  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
-    delete *i;
-
   for (std::vector<GameObject*>::iterator i = gameobjects.begin();
           i != gameobjects.end(); ++i) {
-    Drawable* drawable = dynamic_cast<Drawable*> (*i);
-    if(drawable)
-      displaymanager.remove_drawable(drawable);
     delete *i;
   }
-  bad_guys.clear();
 
   delete level;
 }