- more game object progress

SVN-Revision: 1205

diff --git a/src/level.cpp b/src/level.cpp
index e9612b1..b47b1a6 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -409,7 +409,7 @@ Level::load(const std::string& filename)
                 }
                 else
                 {
-                    if (lisp_symbol(lisp_car(data)) == "trampoline")
+                    if (strcmp(lisp_symbol(lisp_car(data)),"trampoline") == 0)
                     {
                       ObjectData<TrampolineData> _trampoline_data;
 

diff --git a/src/world.cpp b/src/world.cpp
index 68dcb7a..f4d83db 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -50,6 +50,7 @@ World::World(const std::string& filename)
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -71,6 +72,7 @@ World::World(const std::string& subset, int level_nr)
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -106,6 +108,9 @@ World::~World()
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     delete *i;
 
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+    delete *i;
+
   for (ParticleSystems::iterator i = particle_systems.begin();
           i != particle_systems.end(); ++i)
     delete *i;
@@ -161,7 +166,7 @@ World::activate_objects()
   for (std::vector< ObjectData<TrampolineData> >::iterator i = level->trampoline_data.begin();
        i != level->trampoline_data.end();
        ++i)
-  {
+  {puts("fo");
     add_object<Trampoline, ObjectData<TrampolineData> >(*i);
   }
 }
@@ -228,6 +233,9 @@ World::draw()
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     (*i)->draw();
 
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+    (*i)->draw();
+
   tux.draw();
 
   for (unsigned int i = 0; i < bullets.size(); ++i)