[Pingus-CVS] r2716 - branches/pingus_sdl/src

[jsalmon3]

Author: jsalmon3
Date: 2007-07-13 06:13:54 +0200 (Fri, 13 Jul 2007)
New Revision: 2716

Modified:
   branches/pingus_sdl/src/pingus_menu.cpp
   branches/pingus_sdl/src/resource_manager.cpp
Log:
Worldmaps use .worldmap extension instead of .xml, fixed another memory leak

Modified: branches/pingus_sdl/src/pingus_menu.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_menu.cpp     2007-07-12 19:10:16 UTC (rev 
2715)
+++ branches/pingus_sdl/src/pingus_menu.cpp     2007-07-13 04:13:54 UTC (rev 
2716)
@@ -122,7 +122,7 @@
 {
   if (filedialog)
     delete filedialog;
-  filedialog = new FileDialog(this, ".xml", 
+  filedialog = new FileDialog(this, ".worldmap", 
                               path_manager.complete("worldmaps/"), true);
   manager->push_menu (filedialog);
 }
@@ -237,7 +237,7 @@
   if (filemask == ".scm")
     do_contrib(file);
   // Worldmap
-  else if (filemask == ".xml")
+  else if (filemask == ".worldmap")
     do_start(file);
   manager->pop_menu();
 }

Modified: branches/pingus_sdl/src/resource_manager.cpp
===================================================================
--- branches/pingus_sdl/src/resource_manager.cpp        2007-07-12 19:10:16 UTC 
(rev 2715)
+++ branches/pingus_sdl/src/resource_manager.cpp        2007-07-13 04:13:54 UTC 
(rev 2716)
@@ -87,7 +87,9 @@
       reader.read_string("name", name);
       if (!section.empty())
         name = section + "/" + name;
-     
+ 
+      if (resources[name])
+       delete resources[name];
       resources[name] = new SpriteDescription(reader);
     }
   else if (reader.get_name() == "alias")