[Pingus-CVS] CVS: Games/Pingus/src/editorobjs liquid_obj.cxx,1.4,1.5 liquid_obj.hxx,1.4,1.5 surface_background_obj.cxx,1.7,1.8

[grumbel]

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

Modified Files:
        liquid_obj.cxx liquid_obj.hxx surface_background_obj.cxx 
Log Message:
- added intesity to snow generator
- misc other stuff


Index: liquid_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/liquid_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- liquid_obj.cxx      6 Oct 2002 19:18:46 -0000       1.4
+++ liquid_obj.cxx      19 Feb 2003 17:16:59 -0000      1.5
@@ -19,6 +19,9 @@
 
 #include <stdio.h>
 #include "../editor/editor_view.hxx"
+#include "../editor/editor.hxx"
+#include "../editor/property_window.hxx"
+#include "../editor/generic_property_frame.hxx"
 #include "liquid_obj.hxx"
 
 namespace EditorObjs {
@@ -96,6 +99,18 @@
 {
   if (data->width > 1)
     --data->width;
+}
+
+EditorNS::PropertyFrame*
+LiquidObj::get_gui_dialog(EditorNS::Editor* editor)
+{
+  EditorNS::GenericPropertyFrame* propframe 
+    = new EditorNS::GenericPropertyFrame("Liquid Properties",
+                                         
editor->get_property_window()->get_client_area());
+
+  propframe->add_integer_box("speed", &data->speed);
+
+  return propframe;
 }
 
 } // namespace EditorObjs

Index: liquid_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/liquid_obj.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- liquid_obj.hxx      28 Nov 2002 20:09:54 -0000      1.4
+++ liquid_obj.hxx      19 Feb 2003 17:16:59 -0000      1.5
@@ -51,7 +51,7 @@
 
   void make_larger  ();
   void make_smaller ();
-  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }  
+  EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*);
 private:
   LiquidObj (const LiquidObj&);
   LiquidObj& operator= (const LiquidObj&);

Index: surface_background_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_background_obj.cxx  30 Nov 2002 15:19:04 -0000      1.7
+++ surface_background_obj.cxx  19 Feb 2003 17:17:00 -0000      1.8
@@ -77,6 +77,7 @@
 
   propframe->add_check_box("Stretch-X", &data->stretch_x);
   propframe->add_check_box("Stretch-Y", &data->stretch_y);
+  propframe->add_check_box("KeepAspect", &data->keep_aspect);
 
   propframe->add_float_box("Color Red", &data->color.red);
   propframe->add_float_box("Color Green", &data->color.green);