[Pingus-CVS] CVS: Games/Pingus/src/editor EditorEvent.cc,1.61,1.62 ObjectManager.cc,1.67,1.68

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv16225/editor

Modified Files:
        EditorEvent.cc ObjectManager.cc 
Log Message:
Some small cleanup and some file removals

Index: EditorEvent.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/EditorEvent.cc,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- EditorEvent.cc      10 Jun 2002 11:00:28 -0000      1.61
+++ EditorEvent.cc      11 Jun 2002 14:12:13 -0000      1.62
@@ -22,6 +22,8 @@
 #include <ClanLib/Core/System/error.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/mouse.h>
+
+#include "../Debug.hh"
 #include "../globals.hh"
 #include "../PingusGameSession.hh"
 #include "../PingusMessageBox.hh"
@@ -257,9 +259,9 @@
                if ((twidth % tile_size) != 0)
                  {
                    twidth += (tile_size - (twidth % tile_size));
-                   std::cout << "Warning: Editor: Width not a multiple of " 
-                        << tile_size << ", fixing width to " << twidth
-                        << std::endl; 
+                   pwarn << "EditorEvent: Width not a multiple of " 
+                         << tile_size << ", fixing width to " << twidth
+                         << std::endl; 
                  }
                object_manager->width = twidth;
              }
@@ -272,9 +274,9 @@
                if ((theight % tile_size) != 0)
                  {
                    theight += (tile_size - (theight % tile_size));
-                   std::cout << "Warning: Editor: Height not a multiple of " 
-                        << tile_size << ", fixing height to " << theight 
-                        << std::endl; 
+                   pwarn << "EditorEvent: Height not a multiple of " 
+                         << tile_size << ", fixing height to " << theight 
+                         << std::endl; 
                  }
           
                object_manager->height = theight;

Index: ObjectManager.cc
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/ObjectManager.cc,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- ObjectManager.cc    10 Jun 2002 15:01:23 -0000      1.67
+++ ObjectManager.cc    11 Jun 2002 14:12:13 -0000      1.68
@@ -143,10 +143,8 @@
   
   //PSMParser psm;
 
-  if (filename.substr(filename.size() - 4) == ".xml")
-    plf = new XMLPLF(filename);
-  else
-    plf = new PLFPLF(filename + ".plf");
+  //FIXME: Where do we delete the plf? Most likly a memory hole
+  plf = PLF::create(filename);
   
   //psm.parse (filename + ".psm");
   //psm.load_surfaces();
@@ -209,9 +207,6 @@
   comment = plf->get_comment ();
   difficulty = plf->get_difficulty ();
   playable = plf->get_playable ();
-
-  std::cout << "Width: " << width << std::endl;
-  std::cout << "Height: " << height << std::endl;
 
   //  delete plf;
 }