[Pingus-CVS] r3393 - in trunk/pingus/src: . editor

[jsalmon3]

Author: jsalmon3
Date: 2007-10-30 07:24:52 +0100 (Tue, 30 Oct 2007)
New Revision: 3393

Modified:
   trunk/pingus/src/editor/object_selector.cpp
   trunk/pingus/src/levelset.cpp
Log:
Fixed memory leak and warning

Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2007-10-30 06:18:45 UTC (rev 
3392)
+++ trunk/pingus/src/editor/object_selector.cpp 2007-10-30 06:24:52 UTC (rev 
3393)
@@ -114,7 +114,7 @@
   LevelObj* create(const Vector2i& pos, LevelImpl* impl) { 
     LevelObj* obj = new LevelObj("hotspot", impl);
     obj->set_pos(pos);
-    obj->set_pos_z(z_pos);
+    obj->set_pos_z(static_cast<float>(z_pos));
     obj->set_res_desc(desc);
     // obj->set_para();
     return obj;

Modified: trunk/pingus/src/levelset.cpp
===================================================================
--- trunk/pingus/src/levelset.cpp       2007-10-30 06:18:45 UTC (rev 3392)
+++ trunk/pingus/src/levelset.cpp       2007-10-30 06:24:52 UTC (rev 3393)
@@ -62,6 +62,7 @@
               else
                 {
                   std::cout << "Levelset: " << pathname.str() << " is missing 
filename tag" << std::endl;
+                  delete level;
                 }
             }
         }
@@ -72,7 +73,10 @@
 
 Levelset::~Levelset()
 {
-  
+  for(std::vector<Level*>::iterator i = levels.begin(); i != levels.end(); ++i)
+    {
+      delete *i;
+    }
 }
 
 std::string