[Pingus-CVS] CVS: Games/Pingus/src/editorobjs conveyor_belt_obj.cxx,1.5,1.6 conveyor_belt_obj.hxx,1.6,1.7

[grumbel]

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

Modified Files:
        conveyor_belt_obj.cxx conveyor_belt_obj.hxx 
Log Message:
fixed conveyor belt (it should move the pingu, not the belt. , also added 
editor GUI for it


Index: conveyor_belt_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conveyor_belt_obj.cxx       28 Sep 2002 11:52:24 -0000      1.5
+++ conveyor_belt_obj.cxx       4 Mar 2003 10:25:31 -0000       1.6
@@ -18,9 +18,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdio.h>
+#include "../editor/editor.hxx"
 #include "../editor/editor_view.hxx"
-#include "../worldobjsdata/conveyor_belt_data.hxx"
+#include "../editor/generic_property_frame.hxx"
+#include "../editor/property_window.hxx"
 #include "../pingus_resource.hxx"
+#include "../worldobjsdata/conveyor_belt_data.hxx"
 #include "conveyor_belt_obj.hxx"
 
 namespace EditorObjs {
@@ -137,6 +140,19 @@
 {
   if (data->width)
     --data->width;
+}
+
+EditorNS::PropertyFrame*
+ConveyorBeltObj::get_gui_dialog(EditorNS::Editor* editor)
+{
+  EditorNS::GenericPropertyFrame* propframe 
+    = new EditorNS::GenericPropertyFrame("ConveyorBelt Properties",
+                                         
editor->get_property_window()->get_client_area());
+
+  propframe->add_integer_box("Width", &data->width);
+  propframe->add_float_box("Speed", &data->speed);
+  
+  return propframe; 
 }
 
 } // namespace EditorObjs

Index: conveyor_belt_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/conveyor_belt_obj.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- conveyor_belt_obj.hxx       28 Nov 2002 20:09:54 -0000      1.6
+++ conveyor_belt_obj.hxx       4 Mar 2003 10:25:31 -0000       1.7
@@ -68,7 +68,7 @@
   void make_larger ();
   void make_smaller ();
 
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*);
 private:
   ConveyorBeltObj (const ConveyorBeltObj&);
   ConveyorBeltObj& operator= (const ConveyorBeltObj&);