[Pingus-CVS] CVS: Games/Pingus/src/backgrounds starfield_background.hxx,1.8,1.9 surface_background_data.hxx,1.9,1.10 thunderstorm_background_data.hxx,1.8,1.9

[grumbel]

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

Modified Files:
        starfield_background.hxx surface_background_data.hxx 
        thunderstorm_background_data.hxx 
Log Message:
well, not a nice fix for the SpriteObj reference problem, but a working one.
a better solution might be to sync the position data of spriteobj and the 
editorobj on a write call, since its not needed before

Index: starfield_background.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/starfield_background.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- starfield_background.hxx    6 Sep 2002 17:33:29 -0000       1.8
+++ starfield_background.hxx    10 Sep 2002 14:33:07 -0000      1.9
@@ -113,9 +113,11 @@
 public:
   EditorStarfieldBackground (const StarfieldBackgroundData& data)
     : StarfieldBackgroundData (data),
-      SpriteEditorObj ("Stars/starfield_icon", "game", pos),
+      SpriteEditorObj ("Stars/starfield_icon", "game"),
       pos (-64.0f, 0.0f)
-  {}
+  {
+    pos_ref = &pos;
+  }
 
   void write_xml(std::ostream& xml) { this->StarfieldBackgroundData::write_xml 
(xml); }
 

Index: surface_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/surface_background_data.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- surface_background_data.hxx 6 Sep 2002 17:33:29 -0000       1.9
+++ surface_background_data.hxx 10 Sep 2002 14:33:07 -0000      1.10
@@ -92,9 +92,8 @@
 public:
   EditorSurfaceBackground (const SurfaceBackgroundData& data)
     : SurfaceBackgroundData (data),
-      SpriteEditorObj (desc.res_name, desc.datafile, pos)
-  {
-    
+      SpriteEditorObj (desc.res_name, desc.datafile, &pos)
+  {    
   }
 
   void write_xml(std::ostream& xml) { this->SurfaceBackgroundData::write_xml 
(xml); }

Index: thunderstorm_background_data.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/thunderstorm_background_data.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- thunderstorm_background_data.hxx    6 Sep 2002 17:33:29 -0000       1.8
+++ thunderstorm_background_data.hxx    10 Sep 2002 14:33:07 -0000      1.9
@@ -57,7 +57,7 @@
 public:
   EditorThunderstormBackground (const ThunderstormBackgroundData& data)
     : ThunderstormBackgroundData (data),
-      SpriteEditorObj ("Stars/starfield_icon", "game", pos)
+      SpriteEditorObj ("Stars/starfield_icon", "game", &pos)
   {
     pos = CL_Vector(-128.0f, 0.0f);
   }