[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx,1.9,1.10 editor.cxx,1.31,1.32 object_selector.cxx,1.15,1.16 sprite_editorobj.hxx,1.6,1.7 string_reader.cxx,1.6,1.7

[torangan]

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

Modified Files:
        action_window.cxx editor.cxx object_selector.cxx 
        sprite_editorobj.hxx string_reader.cxx 
Log Message:
- splitted IceBlock / ConveyorBelt
- removed unrequired includes (ignoring system headers)


Index: action_window.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action_window.cxx   11 Sep 2002 12:45:58 -0000      1.9
+++ action_window.cxx   14 Sep 2002 19:06:34 -0000      1.10
@@ -19,11 +19,9 @@
 
 #include <iostream>
 #include <algorithm>
-#include <ClanLib/GUI/button.h>
 #include <ClanLib/GUI/window.h>
 #include <ClanLib/GUI/checkbox.h>
 #include <ClanLib/GUI/inputbox.h>
-#include <ClanLib/Core/Math/rect.h>
 #include "../string_converter.hxx"
 #include "action_window.hxx"
 

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- editor.cxx  13 Sep 2002 18:28:26 -0000      1.31
+++ editor.cxx  14 Sep 2002 19:06:34 -0000      1.32
@@ -18,7 +18,6 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <ClanLib/Core/System/system.h>
-#include <ClanLib/Core/Resources/resource_manager.h>
 #include <ClanLib/Display/Display/display.h>
 #include <ClanLib/Display/Input/input.h>
 #include <ClanLib/Display/Display/mousecursor_provider.h>
@@ -41,7 +40,6 @@
 #include "action_window.hxx"
 #include "property_window.hxx"
 #include "level_property_window.hxx"
-#include "../algo.hxx"
 #include "editor.hxx"
 
 #include <cstdio>

Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- object_selector.cxx 14 Sep 2002 13:35:38 -0000      1.15
+++ object_selector.cxx 14 Sep 2002 19:06:34 -0000      1.16
@@ -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 <string>
 #include <ClanLib/Core/System/system.h>
 #include <ClanLib/Core/IOData/directory_scanner.h>
 #include <ClanLib/Display/Input/mouse.h>
@@ -46,9 +45,11 @@
 #include "../backgrounds/thunderstorm_background.hxx"
 
 #include "../editorobjs/bumper_obj.hxx"
+#include "../editorobjs/conveyor_belt_obj.hxx"
 #include "../editorobjs/fake_exit_obj.hxx"
 #include "../editorobjs/guillotine_obj.hxx"
 #include "../editorobjs/hammer_obj.hxx"
+#include "../editorobjs/ice_block_obj.hxx"
 #include "../editorobjs/info_box_obj.hxx"
 #include "../editorobjs/laser_exit_obj.hxx"
 #include "../editorobjs/smasher_obj.hxx"
@@ -56,9 +57,6 @@
 #include "../editorobjs/switch_door_obj.hxx"
 #include "../editorobjs/teleporter_obj.hxx"
 
-#include "../worldobjs/ice_block.hxx"
-#include "../worldobjs/conveyor_belt.hxx"
-
 using namespace std;
 using namespace EditorObjs;
 
@@ -189,19 +187,19 @@
       switch (read_key()) 
        {
        case CL_KEY_1:
-         return TeleporterObj::create (pos);
+         return TeleporterObj::create(pos);
          
        case CL_KEY_2:
-         return SwitchDoorObj::create (pos);
+         return SwitchDoorObj::create(pos);
 
        case CL_KEY_3:
-         return EditorConveyorBeltObj::create (pos);
+         return ConveyorBeltObj::create(pos);
 
        case CL_KEY_4:
-         return EditorIceBlockObj::create (pos);
+         return IceBlockObj::create(pos);
 
        case CL_KEY_5:
-         return InfoBoxObj::create (pos);
+         return InfoBoxObj::create(pos);
          
        case CL_KEY_ESCAPE:
          return EditorObjLst();

Index: sprite_editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/sprite_editorobj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sprite_editorobj.hxx        11 Sep 2002 12:45:58 -0000      1.6
+++ sprite_editorobj.hxx        14 Sep 2002 19:06:34 -0000      1.7
@@ -56,7 +56,7 @@
 
   virtual float get_z_pos();
 
-  virtual CL_Vector get_upper_left_corner();
+  virtual CL_Vector get_upper_left_corner ();
 
   virtual void draw (EditorNS::EditorView *);
 

Index: string_reader.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- string_reader.cxx   17 Aug 2002 17:56:23 -0000      1.6
+++ string_reader.cxx   14 Sep 2002 19:06:34 -0000      1.7
@@ -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>