pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/backgrounds SolidColorBackground.hh,1.14,1.15 StarfieldBackground.hh,1.14,1.15 SurfaceBackgroundData.hh,1.13,1.14
Date: 8 Jun 2002 21:43:39 -0000

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

Modified Files:
        SolidColorBackground.hh StarfieldBackground.hh 
        SurfaceBackgroundData.hh 
Log Message:
Removed Position and all references to operator<<(ostream, CL_Vector) since 
thats buggy in ClanLib

Index: SolidColorBackground.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/SolidColorBackground.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- SolidColorBackground.hh     8 Jun 2002 20:19:54 -0000       1.14
+++ SolidColorBackground.hh     8 Jun 2002 21:43:36 -0000       1.15
@@ -27,7 +27,6 @@
 #include "../WorldObjData.hh"
 #include "../editor/RectEditorObj.hh"
 #include "../editor/EditorView.hh"
-#include "../Position.hh"
 
 class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
 class _xmlNode; typedef _xmlNode* xmlNodePtr;
@@ -104,7 +103,10 @@
     pos += offset;
   }  
 
-  std::string status_line () { return "SolidColorBackground: " + to_string 
(pos); }
+  std::string status_line () { return "SolidColorBackground: " 
+                                + to_string (pos.x) + ", "
+                                + to_string (pos.y) + ", "
+                                + to_string (pos.z); }
 };
 
 #endif

Index: StarfieldBackground.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/StarfieldBackground.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- StarfieldBackground.hh      8 Jun 2002 20:19:54 -0000       1.14
+++ StarfieldBackground.hh      8 Jun 2002 21:43:36 -0000       1.15
@@ -24,7 +24,6 @@
 #include "../boost/smart_ptr.hpp"
 #include "../WorldObj.hh"
 #include "../WorldObjData.hh"
-#include "../Position.hh"
 
 class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;
 class _xmlNode; typedef _xmlNode* xmlNodePtr;
@@ -115,7 +114,10 @@
       (new EditorStarfieldBackground 
(static_cast<StarfieldBackgroundData>(*this)));
   }
 
-  std::string status_line () { return "StarfieldBackground: " + to_string 
(pos); }
+  std::string status_line () { return "StarfieldBackground: " 
+                                + to_string (pos.x) + ", "
+                                + to_string (pos.y) + ", "
+                                + to_string (pos.z); }
 };
 
 #endif

Index: SurfaceBackgroundData.hh
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/backgrounds/SurfaceBackgroundData.hh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- SurfaceBackgroundData.hh    8 Jun 2002 20:19:54 -0000       1.13
+++ SurfaceBackgroundData.hh    8 Jun 2002 21:43:36 -0000       1.14
@@ -25,7 +25,6 @@
 #include "../WorldObjData.hh"
 #include "../Color.hh"
 #include "../ResDescriptor.hh"
-#include "../Position.hh"
 
 class SurfaceBackground;
 class _xmlDoc;  typedef _xmlDoc*  xmlDocPtr;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]