[Pingus-CVS] CVS: Games/Pingus/src/editor editorobj.hxx,1.13,1.14 object_selector.cxx,1.11,1.12

[torangan]

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

Modified Files:
        editorobj.hxx object_selector.cxx 
Log Message:
split teleporter, some cleanup/cosmetic changes


Index: editorobj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- editorobj.hxx       23 Aug 2002 15:49:54 -0000      1.13
+++ editorobj.hxx       9 Sep 2002 16:13:44 -0000       1.14
@@ -23,12 +23,16 @@
 #include "../pingus.hxx"
 #include <string>
 #include <iosfwd>
+#include <vector>
 
 class CL_Rect;
 class CL_Vector;
 class EditorView;
 class CL_Component;
 class Editor;
+
+class EditorObj;
+typedef std::vector<EditorObj*> EditorObjLst;
 
 namespace Pingus
 {

Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- object_selector.cxx 8 Sep 2002 18:13:04 -0000       1.11
+++ object_selector.cxx 9 Sep 2002 16:13:44 -0000       1.12
@@ -52,15 +52,14 @@
 #include "../editorobjs/fake_exit_obj.hxx"
 #include "../editorobjs/hammer_obj.hxx"
 #include "../editorobjs/smasher_obj.hxx"
+#include "../editorobjs/teleporter_obj.hxx"
 
-#include "../worldobjs/teleporter.hxx"
 #include "../worldobjs/ice_block.hxx"
 #include "../worldobjs/info_box.hxx"
 #include "../worldobjs/conveyor_belt.hxx"
 #include "../worldobjs/switch_door.hxx"
 
 using namespace std;
-
 using namespace EditorObjs;
 
 ObjectSelector::ObjectSelector()
@@ -188,7 +187,7 @@
       switch (read_key()) 
        {
        case CL_KEY_1:
-         return EditorTeleporterObj::create (pos);
+         return TeleporterObj::create (pos);
          
        case CL_KEY_2:
          return EditorSwitchDoorObj::create (pos);