[Pingus-CVS] CVS: Games/Pingus/src/editorobjs groundpiece_obj.cxx,1.6,1.7 groundpiece_obj.hxx,1.3,1.4 surface_background_obj.cxx,1.4,1.5

[grumbel]

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

Modified Files:
        groundpiece_obj.cxx groundpiece_obj.hxx 
        surface_background_obj.cxx 
Log Message:
- added some more options to the surfacebackground config dialog
- fixed bug with groundtype handling in the groundpiece dialog


Index: groundpiece_obj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/groundpiece_obj.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- groundpiece_obj.cxx 28 Nov 2002 20:09:54 -0000      1.6
+++ groundpiece_obj.cxx 30 Nov 2002 00:10:29 -0000      1.7
@@ -30,8 +30,7 @@
 
 GroundpieceObj::GroundpieceObj (const WorldObjsData::GroundpieceData& data_)
   : SpriteEditorObj(data_.desc),
-    data(new WorldObjsData::GroundpieceData(data_)),
-    gptype(data->gptype)
+    data(new WorldObjsData::GroundpieceData(data_))
 {
   // Groundpieces must not have a z-pos
   data->pos.z = 0;
@@ -64,7 +63,7 @@
 GroundpieceObj::status_line ()
 {
   char str[1024];  
-  std::string type_name = Groundtype::type_to_string(gptype);
+  std::string type_name = Groundtype::type_to_string(data->gptype);
   
   snprintf(str, 1024, "Groundpiece: %s Type: %s",
           data->desc.res_name.c_str(), type_name.c_str());

Index: groundpiece_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editorobjs/groundpiece_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- groundpiece_obj.hxx 28 Nov 2002 20:09:54 -0000      1.3
+++ groundpiece_obj.hxx 30 Nov 2002 00:10:29 -0000      1.4
@@ -27,18 +27,21 @@
 class GroundpieceData;
 }
 
+namespace EditorNS {
+class GroundpieceWindow;
+}
+
 namespace EditorObjs {
 
 class GroundpieceObj : public SpriteEditorObj
 {
+  friend class EditorNS::GroundpieceWindow;
 private:
   WorldObjsData::GroundpieceData* const data;
 
 public:
-  Groundtype::GPType gptype;
-
   GroundpieceObj (const WorldObjsData::GroundpieceData& data_);
- ~GroundpieceObj ();
+  ~GroundpieceObj ();
 
   /** Flip the object vertical */
   void vertical_flip ();
@@ -58,7 +61,7 @@
   std::string status_line ();
 
   EditorNS::PropertyFrame* get_gui_dialog (EditorNS::Editor* parent);
-  
+
 private:
   GroundpieceObj (const GroundpieceObj&);
   GroundpieceObj& operator= (const GroundpieceObj&);

Index: surface_background_obj.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/editorobjs/surface_background_obj.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_background_obj.cxx  29 Nov 2002 00:17:05 -0000      1.4
+++ surface_background_obj.cxx  30 Nov 2002 00:10:29 -0000      1.5
@@ -76,6 +76,11 @@
   propframe->add_check_box("Stretch-X", &data->stretch_x);
   propframe->add_check_box("Stretch-Y", &data->stretch_y);
 
+  propframe->add_float_box("Color Red", &data->color.red);
+  propframe->add_float_box("Color Green", &data->color.green);
+  propframe->add_float_box("Color Blue", &data->color.blue);
+  propframe->add_float_box("Color Alpha", &data->color.alpha);
+
   return propframe;
 }