[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx,1.30,1.31 editor.hxx,1.16,1.17 editor_event.hxx,1.14,1.15 selection.cxx,1.13,1.14 selection.hxx,1.9,1.10

[grumbel]

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

Modified Files:
        editor.cxx editor.hxx editor_event.hxx selection.cxx 
        selection.hxx 
Log Message:
- added little marker that this is an unplayable develpment version
- fixed bug in laser_exit_obj
- fixed bug in laser kill

Index: editor.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- editor.cxx  11 Sep 2002 12:45:58 -0000      1.30
+++ editor.cxx  13 Sep 2002 18:28:26 -0000      1.31
@@ -68,7 +68,7 @@
   panel      = new Panel;
   scroll_map = new ScrollMap;
   object_manager  = new ObjectManager;
-  selection       = new EditorSelection(object_manager);
+  selection       = new Selection(object_manager);
   status_line     = new StatusLine;
   object_selector = new ObjectSelector;
 

Index: editor.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- editor.hxx  11 Sep 2002 12:45:58 -0000      1.16
+++ editor.hxx  13 Sep 2002 18:28:26 -0000      1.17
@@ -39,7 +39,7 @@
 class Panel;
 class ScrollMap;
 class ObjectManager;
-class EditorSelection;
+class Selection;
 class ObjectSelector;
 class StatusLine;
 class ActionWindow;
@@ -71,7 +71,7 @@
   Panel*  panel;
   ScrollMap* scroll_map;
   ObjectManager* object_manager;
-  EditorSelection* selection;
+  Selection* selection;
   EditorView* view; 
   StatusLine* status_line;
   ObjectSelector* object_selector;

Index: editor_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- editor_event.hxx    11 Sep 2002 12:45:58 -0000      1.14
+++ editor_event.hxx    13 Sep 2002 18:28:26 -0000      1.15
@@ -30,7 +30,7 @@
 namespace EditorNS {
 
 class ObjectManager;
-class EditorSelection;
+class Selection;
 class Editor;
 
 class EditorEvent //: public CL_Event_ButtonPress, public 
CL_Event_ButtonRelease
@@ -47,7 +47,7 @@
 
   Editor* editor;
   ObjectManager* object_manager;
-  EditorSelection* selection;
+  Selection* selection;
   
   virtual void on_button_press(CL_InputDevice *device, const CL_Key &key);
   virtual void on_button_release(CL_InputDevice *device, const CL_Key &key);

Index: selection.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- selection.cxx       11 Sep 2002 12:45:58 -0000      1.13
+++ selection.cxx       13 Sep 2002 18:28:26 -0000      1.14
@@ -29,65 +29,67 @@
 namespace EditorNS {
 
 void
-EditorSelection::move(float x, float y) 
+Selection::move(float x, float y) 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->set_position_offset(CL_Vector(x, y));
 }
 
 void
-EditorSelection::move(const CL_Vector& pos) 
+Selection::move(const CL_Vector& pos) 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->set_position_offset(pos);
 }
 
 void
-EditorSelection::drag() 
+Selection::drag() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->drag();
 }
 
-void EditorSelection::drop() 
+void
+Selection::drop() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->drop();
 }
 
-void EditorSelection::add(EditorObj* obj)
+void
+Selection::add(EditorObj* obj)
 {
   obj_list.push_back(obj);
 }
 
 void
-EditorSelection::add(vector<EditorObj*> objs)
+Selection::add(vector<EditorObj*> objs)
 {
   obj_list.insert(obj_list.end(), objs.begin(), objs.end());
 }
 
 void
-EditorSelection::remove(EditorObj* obj)
+Selection::remove(EditorObj* obj)
 {
   obj_list.erase(std::find(obj_list.begin(), obj_list.end(), obj));
 }
 
 void
-EditorSelection::raise() 
+Selection::raise() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     object_manager->raise_obj(*it);
 }
 
 void
-EditorSelection::lower() 
+Selection::lower() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     object_manager->lower_obj(*it);
 }
 
 void
-EditorSelection::select_rect(float x1_, float y1_, float x2_, float y2_) 
+Selection::select_rect(float x1_, float y1_, float x2_, float y2_) 
 {
   int x1, x2, y1, y2;
   
@@ -107,13 +109,13 @@
 }
 
 bool
-EditorSelection::object_selected(EditorObj* obj) 
+Selection::object_selected(EditorObj* obj) 
 {
   return std::find(obj_list.begin(), obj_list.end(), obj) != obj_list.end();
 }
 
 EditorObj*
-EditorSelection::get_current_obj() 
+Selection::get_current_obj() 
 {
   if (obj_list.size() == 1)
     return *obj_list.begin();
@@ -122,35 +124,35 @@
 }
 
 void
-EditorSelection::horizontal_flip() 
+Selection::horizontal_flip() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->horizontal_flip();
 }
 
 void
-EditorSelection::vertical_flip() 
+Selection::vertical_flip() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->vertical_flip();
 }
 
 void
-EditorSelection::rotate_90() 
+Selection::rotate_90() 
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->rotate_90();
 }
 
 void
-EditorSelection::rotate_270()
+Selection::rotate_270()
 {
   for (vector<EditorObj*>::iterator it = obj_list.begin(); it != 
obj_list.end(); it++)
     (*it)->rotate_270();
 }
 
 void
-EditorSelection::draw(EditorView * view)
+Selection::draw(EditorView * view)
 {
   
   for (vector<EditorObj*>::iterator i = obj_list.begin(); i != obj_list.end(); 
++i) 

Index: selection.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- selection.hxx       11 Sep 2002 12:45:58 -0000      1.9
+++ selection.hxx       13 Sep 2002 18:28:26 -0000      1.10
@@ -28,7 +28,7 @@
 
 class EditorView;
 
-class EditorSelection 
+class Selection 
 {
 private:
   
@@ -37,8 +37,8 @@
     
 public:
   
-  EditorSelection(ObjectManager* mng) : object_manager(mng) { }
-  ~EditorSelection() { }
+  Selection(ObjectManager* mng) : object_manager(mng) { }
+  ~Selection() { }
     
   void clear() { obj_list.clear(); }
     
@@ -75,8 +75,8 @@
   void draw(EditorView* view);  
   
 private:
-  EditorSelection (const EditorSelection&);
-  EditorSelection operator= (const EditorSelection&);
+  Selection (const Selection&);
+  Selection operator= (const Selection&);
 };
 
 } // namespace EditorNS