[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.17,1.18 editor_event.cxx,1.22,1.23 editor_event.hxx,1.10,1.11 editor_groundpiece_obj.cxx,1.8,1.9 editorobj.hxx,1.9,1.10 editorobj_group.hxx,1.7,1.8 editorobj_group_data.hxx,1.3,1.4 object_manager.cxx,1.20,1.21 object_manager.hxx,1.12,1.13 object_selector.cxx,1.6,1.7 object_selector.hxx,1.5,1.6 panel.hxx,1.3,1.4 plfobj.cxx,1.5,1.6 property_window.cxx,1.6,1.7 selection.hxx,1.6,1.7 start_pos.cxx,1.4,1.5 status_line.cxx,1.5,1.6 status_line.hxx,1.5,1.6 string_reader.cxx,1.3,1.4 string_reader.hxx,1.2,1.3 surface_selector.hxx,1.3,1.4 thumb_cache.hxx,1.3,1.4 weather_obj.cxx,1.4,1.5

[torangan]

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

Modified Files:
        editor.cxx editor_event.cxx editor_event.hxx 
        editor_groundpiece_obj.cxx editorobj.hxx editorobj_group.hxx 
        editorobj_group_data.hxx object_manager.cxx object_manager.hxx 
        object_selector.cxx object_selector.hxx panel.hxx plfobj.cxx 
        property_window.cxx selection.hxx start_pos.cxx 
        status_line.cxx status_line.hxx string_reader.cxx 
        string_reader.hxx surface_selector.hxx thumb_cache.hxx 
        weather_obj.cxx 
Log Message:
some cleanup


Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- editor.cxx  2 Jul 2002 09:14:20 -0000       1.17
+++ editor.cxx  2 Jul 2002 13:36:06 -0000       1.18
@@ -20,10 +20,7 @@
 #include <cstdio>
 #include <string>
 
-#include <ClanLib/gui.h>
-
 #include <ClanLib/Core/System/system.h>
-#include <ClanLib/Core/Math/rect.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Display/mousecursor_provider.h>
@@ -33,8 +30,6 @@
 #include <ClanLib/Display/Input/keyboard.h>
 #include "../algo.hxx"
 #include "../globals.hxx"
-#include "../pingus_error.hxx"
-#include "../message_box.hxx"
 #include "../display.hxx"
 #include "../pingus_resource.hxx"
 #include "../system.hxx"
@@ -44,7 +39,6 @@
 #include "scroll_map.hxx"
 #include "status_line.hxx"
 #include "object_selector.hxx"
-#include "object_manager.hxx"
 #include "selection.hxx"
 #include "action_window.hxx"
 #include "property_window.hxx"

Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- editor_event.cxx    2 Jul 2002 10:42:38 -0000       1.22
+++ editor_event.cxx    2 Jul 2002 13:36:06 -0000       1.23
@@ -21,7 +21,6 @@
 #include <fstream>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/Core/System/error.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/mouse.h>
 
@@ -30,12 +29,10 @@
 #include "../globals.hxx"
 #include "../game_session.hxx"
 #include "../message_box.hxx"
-#include "../globals.hxx"
 #include "../system.hxx"
 #include "../pingus_error.hxx"
 #include "../loading.hxx"
 #include "../my_gettext.hxx"
-#include "object_manager.hxx"
 #include "selection.hxx"
 #include "editorobj_group.hxx"
 #include "string_reader.hxx"

Index: editor_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- editor_event.hxx    1 Jul 2002 16:10:29 -0000       1.10
+++ editor_event.hxx    2 Jul 2002 13:36:06 -0000       1.11
@@ -20,6 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOR_EVENT_HXX
 #define HEADER_PINGUS_EDITOR_EDITOR_EVENT_HXX
 
+#include <vector>
 #include "../color.hxx"
 
 class CL_Key;

Index: editor_groundpiece_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editor/editor_groundpiece_obj.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- editor_groundpiece_obj.cxx  1 Jul 2002 18:36:39 -0000       1.8
+++ editor_groundpiece_obj.cxx  2 Jul 2002 13:36:06 -0000       1.9
@@ -18,10 +18,8 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
-#include "../boost/smart_ptr.hpp"
 #include "../pingus_resource.hxx"
 #include "groundpiece_window.hxx"
-#include "editor_groundpiece_obj.hxx"
 
 using namespace Pingus;
 

Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editorobj.hxx       1 Jul 2002 18:36:39 -0000       1.9
+++ editorobj.hxx       2 Jul 2002 13:36:06 -0000       1.10
@@ -37,10 +37,6 @@
   }
 }
 
-namespace boost {
-  template <class T> class shared_ptr;
-}
-
 /** Interface for all objects which can be shown in the editor */
 class EditorObj
 {

Index: editorobj_group.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editorobj_group.hxx 1 Jul 2002 18:36:40 -0000       1.7
+++ editorobj_group.hxx 2 Jul 2002 13:36:06 -0000       1.8
@@ -20,10 +20,9 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOROBJ_GROUP_HXX
 #define HEADER_PINGUS_EDITOR_EDITOROBJ_GROUP_HXX
 
+#include <vector>
 #include <ClanLib/Core/Math/cl_vector.h>
-#include "../boost/smart_ptr.hpp"
 #include "editorobj.hxx"
-#include <vector>
 
 class EditorObjGroup : public EditorObj
 {

Index: editorobj_group_data.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj_group_data.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- editorobj_group_data.hxx    25 Jun 2002 12:20:33 -0000      1.3
+++ editorobj_group_data.hxx    2 Jul 2002 13:36:06 -0000       1.4
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOR_EDITOROBJ_GROUP_DATA_HXX
 #define HEADER_PINGUS_EDITOR_EDITOROBJ_GROUP_DATA_HXX
 
-#include <vector>
+#include "../libxmlfwd.hxx"
 #include "../worldobj_data.hxx"
 
 class EditorObjGroupData : public WorldObjData

Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- object_manager.cxx  2 Jul 2002 10:42:38 -0000       1.20
+++ object_manager.cxx  2 Jul 2002 13:36:06 -0000       1.21
@@ -18,16 +18,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/Math/rect.h>
-#include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/Display/Input/key.h>
 #include "../globals.hxx"
-#include "../math.hxx"
 #include "../system.hxx"
 #include "../plf_plf.hxx"
 #include "../xml_helper.hxx"
 #include "../pingus_resource.hxx"
 #include "../pingus_error.hxx"
-#include "../xml_helper.hxx"
 #include "../worldobj_group_data.hxx"
 #include "start_pos.hxx"
 #include "object_manager.hxx"
@@ -41,48 +37,20 @@
 using namespace Pingus;
 using namespace Actions;
 
-/** */
+
 static bool EditorObj_z_pos_sorter (EditorObj* a, 
                                    EditorObj* b)
 {
   return a->get_z_pos () < b->get_z_pos ();
 }
 
-class EditorObj_finder
-{
-private:
-  EditorObj* object;
-public:
-  EditorObj_finder (EditorObj* obj) 
-    : object (obj)
-  {}
-
-  bool operator() (boost::shared_ptr<EditorObj> a) {
-    return (a.get() == object);
-  }
-};
-
-#ifdef WIN32
-//FIXME: ingo: This is a workaround around the std::list::sort()
-//FIXME: problem under MSVC6. This is copy&paste from an usenet
-//FIXME: article, so it might work or not, never tested it.
-// typedef boost::shared_ptr<EditorObj>& CEditorObjPtr;
-// template<>
-// bool std::greater<CEditorObjPtr>::operator()(shared_ptr<EditorObj>& a, 
shared_ptr<EditorObj>& b) const
-//{
-//  return EditorObj_z_pos_sorter (a, b);
-//} 
-#endif
-
 ObjectManager::ObjectManager()
 {
-  plf = 0;
   new_level();
 }
 
 ObjectManager::~ObjectManager()
 {
-  if (plf) delete plf;
 }
 
 void
@@ -113,11 +81,6 @@
   number_to_save   = 25;
   number_of_pingus = 50;
   
-  //backgrounds.push_back(new SurfaceBackgroundData ());
-
-  //background->desc.datafile = "textures";
-  //background->desc.res_name = "Textures/default";
-
   delete_all_objs();
   editor_objs.push_back(new StartPos(50, 50));
 
@@ -148,13 +111,7 @@
   std::cout << "Editor: Clearing current level..." << endl;
   std::cout << "Loading new level: " << filename << endl;
   
-  //PSMParser psm;
-
-  //FIXME: Where do we delete the plf? Most likly a memory hole
-  plf = PLF::create(filename);
-  
-  //psm.parse (filename + ".psm");
-  //psm.load_surfaces();
+  PLF* plf = PLF::create(filename);
 
   editor_objs.push_back(new StartPos(plf->get_startx(), 
                                     plf->get_starty()));
@@ -188,15 +145,7 @@
     editor_objs.insert(editor_objs.end(), temp.begin(), temp.end() );
   }
 
-#ifdef WIN32
-  //FIXME: ingo: This is a workaround around the std::list::sort()
-  //FIXME: problem under MSVC6. This is copy&paste from an usenet
-  //FIXME: article, so it might work or not, never tested it.
-  // Alpha notes that this does NOT work.
-  //  world_obj.sort(std::greater<CWorldObjPtr>());
-#else
   std::sort(editor_objs.begin (), editor_objs.end (), EditorObj_z_pos_sorter);
-#endif
 
   std::cout << "Reading props" << std::endl;
   description = plf->get_description();
@@ -206,7 +155,6 @@
   number_of_pingus = plf->get_pingus();
   height      = plf->get_height();
   width       = plf->get_width();
-  //backgrounds  = plf->get_backgrounds();
   author      = plf->get_author();
   start_x_pos = plf->get_startx();
   start_y_pos = plf->get_starty();
@@ -215,25 +163,8 @@
   comment = plf->get_comment ();
   difficulty = plf->get_difficulty ();
   playable = plf->get_playable ();
-
-  //  delete plf;
-}
-
-void
-ObjectManager::draw_scroll_map(int /*x_pos*/, int /*y_pos*/, int 
/*arg_width*/, int /*arg_height*/)
-{
-  /*
-    for (EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i) 
-    {
-    (*i)->draw_scroll_map(x_pos, y_pos,
-    arg_width, arg_height);
-                           
-    Display::draw_rect(x_pos + (*i)->get_x_pos() * arg_width / width,
-    y_pos + (*i)->get_y_pos() * arg_height / height,
-    x_pos + (*i)->get_x_pos() * arg_width / width + 10,
-    y_pos + (*i)->get_y_pos() * arg_height / height + 10,
-    0.0, 1.0, 0.0, 1.0);
-    }*/
+  
+  delete plf;
 }
 
 void 
@@ -296,29 +227,6 @@
       << "  </global>\n"
       << std::endl;
   
-  /*for (std::vector<boost::shared_ptr<BackgroundData> >::iterator i = 
backgrounds.begin();
-    i != backgrounds.end();
-    i++)
-    (*i)->write_xml(&xml);
-  */
-  /*  xml << "<background>\n";
-      EditorObj::save_desc_xml(&xml, background.desc);
-  
-      xml  << "  <color>\n"
-      << "    <red>"   << background.color.red   << "</red>\n"
-      << "    <green>" << background.color.green << "</green>\n"
-      << "    <blue>"  << background.color.blue << "</blue>\n"
-      << "    <alpha>" << background.color.alpha   << "</alpha>\n"
-      << "  </color>\n"
-      << "  <scroll-x>"  << background.scroll_x << "</scroll-x>\n"
-      << "  <scroll-y>"  << background.scroll_y << "</scroll-y>\n"
-      << "  <para-x>"    << background.para_x << "</para-x>\n"
-      << "  <para-y>"    << background.para_y << "</para-y>\n"
-      << "  <stretch-x>" << background.stretch_x << "</stretch-x>\n"
-      << "  <stretch-y>" << background.stretch_y << "</stretch-y>\n" 
-      << "</background>\n"
-      << endl;
-  */
   // Printing actions to file
   xml << "  <action-list>\n";
   for (vector<ActionData>::iterator i = actions.begin(); i != actions.end(); 
++i) {
@@ -351,11 +259,6 @@
   prev--;
 
   swap(*prev, *current);
-  /* FIXME: not sure if we need this on windows, if not delete it
-     boost::shared_ptr<EditorObj> tmp = *prev;
-     *prev = *current;
-     *current = tmp;
-     */
   return true;
 }
 
@@ -376,35 +279,8 @@
     }
   
   swap(*next, *current);
-  /* FIXME: not sure if we need this on windows, if not delete it
-     boost::shared_ptr<EditorObj> tmp = *next;
-     *next = *current;
-     *current = tmp;
-     */
   return true;
 }
-/*
-void
-ObjectManager::rect_get_current_objs(float x_1, float y_1, float x_2, float 
y_2)
-{
-  float x1, x2, y1, y2;
-
-  if (!CL_Keyboard::get_keycode(CL_KEY_LSHIFT)
-      && !CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
-    delete_selection();
-  
-  x1 = Math::min(x_1, x_2);
-  x2 = Math::max(x_1, x_2);
-  y1 = Math::min(y_1, y_2);
-  y2 = Math::max(y_1, y_2);  
-
-  for(EditorObjIter i = editor_objs.begin(); i != editor_objs.end(); ++i) 
-    {
-      if ((*i)->is_in_rect(CL_Rect((int) x1, (int) y1, (int) x2, (int) y2)))
-       current_objs.push_back(*i);
-    }
-}
-*/
 
 vector<EditorObj*>
 ObjectManager::rect_get_objs(int x1, int y1, int x2, int y2)
@@ -457,53 +333,6 @@
   return 0;
 }
 
-/*
-void
-ObjectManager::move_current_objs(float x, float y)
-{
-  for (CurrentObjIter i = current_objs.begin(); i != current_objs.end(); i++) 
-    {
-      (*i)->set_position_offset(CL_Vector(x, y));
-    }
-}
-
-void 
-ObjectManager::drag_current_objs ()
-{
-  for (CurrentObjIter i = current_objs.begin(); i != current_objs.end(); ++i)
-    (*i)->drag ();
-}
-
-void 
-ObjectManager::drop_current_objs ()
-{
-  for (CurrentObjIter i = current_objs.begin(); i != current_objs.end(); ++i)
-    (*i)->drop ();
-}
-
-void
-ObjectManager::add_to_selection(boost::shared_ptr<EditorObj> obj)
-{
-  current_objs.push_back(obj);
-}
-
-void 
-ObjectManager::add_to_selection(std::list<boost::shared_ptr<EditorObj> > objs)
-{
-  for(std::list<boost::shared_ptr<EditorObj> >::iterator i = objs.begin(); 
-      i != objs.end(); i++)
-    current_objs.push_back(*i);
-}
-
-boost::shared_ptr<EditorObj> 
-ObjectManager::get_current_obj()
-{
-  if (current_objs.size() == 1)
-    return *current_objs.begin();
-  else
-    return boost::shared_ptr<EditorObj>();
-}
-*/
 void
 ObjectManager::add_object_group_from_file (const std::string& filename)
 {

Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- object_manager.hxx  2 Jul 2002 10:42:39 -0000       1.12
+++ object_manager.hxx  2 Jul 2002 13:36:07 -0000       1.13
@@ -20,18 +20,13 @@
 #ifndef HEADER_PINGUS_EDITOR_OBJECT_MANAGER_HXX
 #define HEADER_PINGUS_EDITOR_OBJECT_MANAGER_HXX
 
-#include <list>
 #include <map>
 #include "../color.hxx"
 #include "../action_data.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "editorobj.hxx"
 
-class PLF;
 class EditorView;
 
-
-
 /// Manager for all level objects.
 class ObjectManager
 {
@@ -60,14 +55,9 @@
   /** All objects which are visible in the editor */ 
   std::vector<EditorObj*> editor_objs;
 
-  /** This list contains all objects, which are in the current
-      selection */
-  //std::vector<boost::shared_ptr<EditorObj> > current_objs;
-
   int move_offset;
 
   Color bg;
-  PLF* plf;
   
 public:
   typedef std::vector<EditorObj*>::iterator EditorObjIter;
@@ -85,35 +75,17 @@
   void save_level_xml (const std::string & filename);
 
   void draw(EditorView * view);
-  void draw_scroll_map(int x_pos, int y_pos, int arg_width, int arg_height);
-
-  //bool object_selected(boost::shared_ptr<EditorObj> c_obj);
-  //void move_obj();
 
-  //void delete_selection();
   void delete_all_objs();
 
   void add_object_group_from_file (const std::string& filename);
 
-  //void rect_get_current_objs(float x1, float y1, float x2, float y2);
   std::vector<EditorObj*> rect_get_objs(int x1, int y1, int x2, int y2);
 
   int get_width() { return width; }
   int get_height() { return height; }
 
-  /** Return the currently selected object, if none is selected or
-      multiple objects are selected return 0 */
-  //boost::shared_ptr<EditorObj> get_current_obj();
-  
-  //void move_current_objs(float x, float y);
-  //void drag_current_objs ();
-  //void drop_current_objs ();
-
-  //void add_to_selection(boost::shared_ptr<EditorObj> obj);
-  //void add_to_selection(std::vector<boost::shared_ptr<EditorObj> > objs);
-
   bool raise_obj(EditorObj* obj);
-  //void raise_current_objs();
   bool lower_obj(EditorObj* obj);
 
   /** Add a new object to the ObjectManager. The ObjectManager will
@@ -126,11 +98,6 @@
 
   /** Erase objects from the ObjectManager and delete them */
   void erase (const std::vector<EditorObj*>&);
-
-  //void lower_current_objs();
-
-  /** Remove an object from the current selection */
-  //void unselect_object(boost::shared_ptr<EditorObj> c_obj);
 
   /** Add the object at the given position to the selection */
   EditorObj* find_object(const CL_Vector & pos);

Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- object_selector.cxx 2 Jul 2002 10:42:39 -0000       1.6
+++ object_selector.cxx 2 Jul 2002 13:36:07 -0000       1.7
@@ -28,11 +28,9 @@
 #include "../globals.hxx"
 #include "../pingus_resource.hxx"
 #include "../loading.hxx"
-#include "../blitter.hxx"
 #include "string_reader.hxx"
 #include "weather_obj.hxx"
 #include "object_selector.hxx"
-#include "surface_selector.hxx"
 #include "thumb_cache.hxx"
 #include "editor_groundpiece_obj.hxx"
 #include "plfobj.hxx"

Index: object_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- object_selector.hxx 2 Jul 2002 10:42:39 -0000       1.5
+++ object_selector.hxx 2 Jul 2002 13:36:07 -0000       1.6
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HXX
 
 #include <config.h>
+#include <map>
 #include <list>
 #include "../groundpiece_data.hxx"
 #include "surface_selector.hxx"

Index: panel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- panel.hxx   29 Jun 2002 09:44:56 -0000      1.3
+++ panel.hxx   2 Jul 2002 13:36:07 -0000       1.4
@@ -21,6 +21,7 @@
 #define HEADER_PINGUS_EDITOR_PANEL_HXX
 
 #include <vector>
+#include <ClanLib/Display/Display/surface.h>
 
 class CL_Font;
 class Editor;

Index: plfobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plfobj.cxx  1 Jul 2002 18:36:40 -0000       1.5
+++ plfobj.cxx  2 Jul 2002 13:36:07 -0000       1.6
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 #include "../pingus_error.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "editor_view.hxx"
 #include "plfobj.hxx"
 #include "entrance_window.hxx"

Index: property_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- property_window.cxx 1 Jul 2002 16:31:40 -0000       1.6
+++ property_window.cxx 2 Jul 2002 13:36:07 -0000       1.7
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../boost/smart_ptr.hpp"
 #include "editorobj.hxx"
 #include "property_frame.hxx"
 #include "property_window.hxx"

Index: selection.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- selection.hxx       2 Jul 2002 09:14:20 -0000       1.6
+++ selection.hxx       2 Jul 2002 13:36:07 -0000       1.7
@@ -20,8 +20,6 @@
 #ifndef HEADER_PINGUS_EDITOR_SELECTION_HXX
 #define HEADER_PINGUS_EDITOR_SELECTION_HXX
 
-#include <list>
-#include "editorobj.hxx"
 #include "object_manager.hxx"
 
 class CL_Vector;

Index: start_pos.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/start_pos.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- start_pos.cxx       1 Jul 2002 18:36:40 -0000       1.4
+++ start_pos.cxx       2 Jul 2002 13:36:07 -0000       1.5
@@ -19,7 +19,6 @@
 
 #include <fstream>
 #include "../xml_helper.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "start_pos.hxx"
 
 StartPos::StartPos(int arg_x_pos, int arg_y_pos)

Index: status_line.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- status_line.cxx     1 Jul 2002 16:47:31 -0000       1.5
+++ status_line.cxx     2 Jul 2002 13:36:07 -0000       1.6
@@ -23,7 +23,6 @@
 #include <ClanLib/Display/Input/mouse.h>
 #include <ClanLib/Display/Display/display.h>
 #include "../pingus_resource.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "editor_view.hxx"
 #include "status_line.hxx"
 #include "editorobj.hxx"

Index: status_line.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- status_line.hxx     1 Jul 2002 16:47:31 -0000       1.5
+++ status_line.hxx     2 Jul 2002 13:36:07 -0000       1.6
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_EDITOR_STATUS_LINE_HXX
 #define HEADER_PINGUS_EDITOR_STATUS_LINE_HXX
 
-#include <list>
+#include <vector>
 
 class CL_Font;
 class EditorObj;

Index: string_reader.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- string_reader.cxx   26 Jun 2002 16:49:33 -0000      1.3
+++ string_reader.cxx   2 Jul 2002 13:36:07 -0000       1.4
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Input/inputdevice.h>
 #include <ClanLib/Display/Input/inputbuffer.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Font/font.h>

Index: string_reader.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- string_reader.hxx   24 Jun 2002 22:52:58 -0000      1.2
+++ string_reader.hxx   2 Jul 2002 13:36:07 -0000       1.3
@@ -23,6 +23,8 @@
 #include <list>
 #include <string>
 
+class CL_Font;
+
 ///
 class StringReader
 {

Index: surface_selector.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/surface_selector.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- surface_selector.hxx        24 Jun 2002 22:52:58 -0000      1.3
+++ surface_selector.hxx        2 Jul 2002 13:36:07 -0000       1.4
@@ -22,6 +22,9 @@
 
 #include <string>
 #include <vector>
+#include <ClanLib/Display/Display/surface.h>
+
+class CL_Font;
 
 ///
 struct surface_obj

Index: thumb_cache.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- thumb_cache.hxx     24 Jun 2002 22:52:58 -0000      1.3
+++ thumb_cache.hxx     2 Jul 2002 13:36:07 -0000       1.4
@@ -22,6 +22,8 @@
 
 #include <string>
 
+class CL_Surface;
+
 /** This class is used inside the SurfaceSelector to load thumbnails
     of surfaces for selection */
 class ThumbCache

Index: weather_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/weather_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- weather_obj.cxx     1 Jul 2002 18:36:40 -0000       1.4
+++ weather_obj.cxx     2 Jul 2002 13:36:07 -0000       1.5
@@ -19,7 +19,6 @@
 
 #include <fstream>
 #include "../xml_helper.hxx"
-#include "../boost/smart_ptr.hpp"
 #include "editor_view.hxx"
 #include "weather_obj.hxx"