[Super-tux-commit] supertux/src background.cpp,1.12,1.13

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2324/src

Modified Files:
	background.cpp 
Log Message:
Changed the background feeding format for the new level format.
Instead of: (top_red 255) (top_green 60) (top_blue 10)
It'd be: (top_color 255 60 10)

Index: background.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/background.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- background.cpp	20 Jul 2004 18:04:47 -0000	1.12
+++ background.cpp	21 Aug 2004 11:44:42 -0000	1.13
@@ -36,13 +36,10 @@
     set_image(imagefile, speed);
   }
 
-  int tr, tg, tb, br, bg, bb;
-  if(reader.read_int("top_red", tr) && reader.read_int("top_green", tg)
-      && reader.read_int("top_blue", tb) && reader.read_int("bottom_red", br)
-      && reader.read_int("bottom_green", bg)
-      && reader.read_int("bottom_blue", bb)) {
-    set_gradient(Color(tr, tg, tb), Color(br, bg, bb));
-  }
+  std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color;
+  if(reader.read_int_vector("top_color", bkgd_top_color) &&
+     reader.read_int_vector("bottom_color", bkgd_bottom_color))
+    set_gradient(Color(bkgd_top_color), Color(bkgd_bottom_color));
 }
 
 Background::~Background()
@@ -62,12 +59,15 @@
     writer.write_string("image", imagefile);
     writer.write_float("speed", speed);
   } else if(type == GRADIENT) {
-    writer.write_int("top_red", gradient_top.red);
-    writer.write_int("top_green", gradient_top.green);
-    writer.write_int("top_blue", gradient_top.blue);
-    writer.write_int("bottom_red", gradient_bottom.red);
-    writer.write_int("bottom_green", gradient_bottom.green);
-    writer.write_int("bottom_blue", gradient_bottom.blue);
+    std::vector <unsigned int> bkgd_top_color, bkgd_bottom_color;
+    bkgd_top_color.push_back(gradient_top.red);
+    bkgd_top_color.push_back(gradient_top.green);
+    bkgd_top_color.push_back(gradient_top.blue);
+    bkgd_bottom_color.push_back(gradient_top.red);
+    bkgd_bottom_color.push_back(gradient_top.green);
+    bkgd_bottom_color.push_back(gradient_top.blue);
+    writer.write_int_vector("top_color", bkgd_top_color);
+    writer.write_int_vector("bottom_color", bkgd_bottom_color);
   }
   
   writer.end_list("background");