[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx, 1.49, 1.50 surface_selector.cxx, 1.10, 1.11

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv18306/editor

Modified Files:
        object_manager.cxx surface_selector.cxx 
Log Message:
- some namespace and CL0.7 stuff

Index: object_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- object_manager.cxx  18 Oct 2003 23:17:27 -0000      1.49
+++ object_manager.cxx  20 Oct 2003 13:33:43 -0000      1.50
@@ -140,7 +140,7 @@
        i != temp_surfaces.end();
        i++)
     {
-      i->surface = PingusResource::load_surface(i->desc);
+      i->surface = PingusResource::load_sprite(i->desc);
     }
 
   std::vector<WorldObjData*> temp_worldobj = plf->get_worldobjs_data();

Index: surface_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- surface_selector.cxx        18 Oct 2003 23:17:27 -0000      1.10
+++ surface_selector.cxx        20 Oct 2003 13:33:43 -0000      1.11
@@ -125,6 +125,7 @@
   //CL_Display::get_width(), y+1/10,
   //1.0, 1.0, 1.0, 1.0);
 
+#ifdef CLANLIB_0_6
   // Draw the current object in the bottom/left corner when the
   // surface is selected for more then 1sec
   if (c_obj != std::vector<surface_obj>::iterator()
@@ -141,6 +142,8 @@
                            0.5f, 0.5f, 0.5f, 0.8f);
       c_obj->large_sur.draw(0, CL_Display::get_height() - 
c_obj->large_sur.get_height());
     }
+#endif
+
   Display::flip_display();
 }