pingus-cvs
[Top][All Lists]
Advanced

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

[Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata surface_background_data


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/worldobjsdata surface_background_data.cxx,1.4,1.5
Date: 12 Oct 2002 00:22:58 -0000

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

Modified Files:
        surface_background_data.cxx 
Log Message:
fixed float vs. bool issue

Index: surface_background_data.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/worldobjsdata/surface_background_data.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_background_data.cxx 28 Sep 2002 11:52:27 -0000      1.4
+++ surface_background_data.cxx 12 Oct 2002 00:22:56 -0000      1.5
@@ -25,28 +25,29 @@
 
 namespace WorldObjsData {
 
-SurfaceBackgroundData::SurfaceBackgroundData () : para_x(0.5),
-                                                 para_y(0.5),
-                                                 pos(Vector(0, 0, -150)),
-                                                 scroll_x(0.0),
-                                                  scroll_y(0.0),
-                                                 color(Color(0,0,0,0)),
-                                                 stretch_x(false),
-                                                 stretch_y(false)
+SurfaceBackgroundData::SurfaceBackgroundData ()
+  : para_x(0.5),
+    para_y(0.5),
+    pos(Vector(0, 0, -150)),
+    scroll_x(0.0),
+    scroll_y(0.0),
+    color(Color(0,0,0,0)),
+    stretch_x(false),
+    stretch_y(false)
 {
 }
 
 SurfaceBackgroundData::SurfaceBackgroundData (const SurfaceBackgroundData& 
old) 
-                                             : WorldObjData(old),
-                                              desc(old.desc),
-                                               para_x(old.para_x),
-                                              para_y(old.para_y),
-                                              pos(old.pos),
-                                              scroll_x(old.scroll_x),
-                                              scroll_y(old.scroll_y),
-                                              color(old.color),
-                                              stretch_x(old.stretch_x),
-                                              stretch_y(old.stretch_y)
+  : WorldObjData(old),
+    desc(old.desc),
+    para_x(old.para_x),
+    para_y(old.para_y),
+    pos(old.pos),
+    scroll_x(old.scroll_x),
+    scroll_y(old.scroll_y),
+    color(old.color),
+    stretch_x(old.stretch_x),
+    stretch_y(old.stretch_y)
 {
 }
 
@@ -112,11 +113,11 @@
        }
       else if (XMLhelper::equal_str(cur->name, "stretch-x"))
        {
-         stretch_x = XMLhelper::parse_float(doc, cur);
+         stretch_x = XMLhelper::parse_bool(doc, cur);
        }
       else if (XMLhelper::equal_str(cur->name, "stretch-y"))
        {
-         stretch_y = XMLhelper::parse_float(doc, cur);
+         stretch_y = XMLhelper::parse_bool(doc, cur);
        }
       else if (XMLhelper::equal_str(cur->name, "position"))
        {





reply via email to

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