[Super-tux-commit] supertux/src level.cpp,1.73,1.74 world.cpp,1.92,1.93

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3161

Modified Files:
	level.cpp world.cpp 
Log Message:
- more game object progress

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- level.cpp	16 May 2004 01:36:54 -0000	1.73
+++ level.cpp	16 May 2004 02:07:26 -0000	1.74
@@ -409,7 +409,7 @@
                 }
                 else
                 {
-                    if (lisp_symbol(lisp_car(data)) == "trampoline")
+                    if (strcmp(lisp_symbol(lisp_car(data)),"trampoline") == 0)
                     {
                       ObjectData<TrampolineData> _trampoline_data;
 

Index: world.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/world.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- world.cpp	16 May 2004 01:36:54 -0000	1.92
+++ world.cpp	16 May 2004 02:07:26 -0000	1.93
@@ -50,6 +50,7 @@
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -71,6 +72,7 @@
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -106,6 +108,9 @@
   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 @@
   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 @@
   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)