* Comment out resizable flag because it blue-screens on Windows

[supertux.git] / src / object / gradient.cpp

diff --git a/src/object/gradient.cpp b/src/object/gradient.cpp
index a2c9a03..9c40fc0 100644 (file)
--- a/src/object/gradient.cpp
+++ b/src/object/gradient.cpp
@@ -1,7 +1,7 @@
-//  $Id: background.cpp 3144 2006-03-31 10:31:03Z matzebraun $
+//  $Id$
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.de
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -16,6 +16,7 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include <stdexcept>
@@ -27,7 +28,7 @@
 #include "object_factory.hpp"
 #include "resources.hpp"
 #include "main.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 
 Gradient::Gradient()
   : layer(LAYER_BACKGROUND0)
@@ -39,8 +40,8 @@ Gradient::Gradient(const lisp::Lisp& reader)
 {
   reader.get("layer", layer);
   std::vector<float> bkgd_top_color, bkgd_bottom_color;
-  if(!reader.get_vector("top_color", bkgd_top_color) ||
-     !reader.get_vector("bottom_color", bkgd_bottom_color))
+  if(!reader.get("top_color", bkgd_top_color) ||
+     !reader.get("bottom_color", bkgd_bottom_color))
     throw std::runtime_error("Must specify top_color and bottom_color in gradient");
 
   gradient_top = Color(bkgd_top_color);
@@ -63,11 +64,11 @@ Gradient::write(lisp::Writer& writer)
   bkgd_bottom_color.push_back(gradient_bottom.red);
   bkgd_bottom_color.push_back(gradient_bottom.green);
   bkgd_bottom_color.push_back(gradient_bottom.blue);
-  writer.write_float_vector("top_color", bkgd_top_color);
-  writer.write_float_vector("bottom_color", bkgd_bottom_color);
+  writer.write("top_color", bkgd_top_color);
+  writer.write("bottom_color", bkgd_bottom_color);
+
+  writer.write("layer", layer);
 
-  writer.write_int("layer", layer);
-  
   writer.end_list("gradient");
 }
 
@@ -81,13 +82,13 @@ Gradient::set_gradient(Color top, Color bottom)
 {
   gradient_top = top;
   gradient_bottom = bottom;
-  
+
   if (gradient_top.red > 1.0 || gradient_top.green > 1.0
    || gradient_top.blue > 1.0 || gradient_top.alpha > 1.0)
-    msg_warning("top gradient color has values above 1.0");
+    log_warning << "top gradient color has values above 1.0" << std::endl;
   if (gradient_bottom.red > 1.0 || gradient_bottom.green > 1.0
    || gradient_bottom.blue > 1.0 || gradient_bottom.alpha > 1.0)
-    msg_warning("bottom gradient color has values above 1.0");
+    log_warning << "bottom gradient color has values above 1.0" << std::endl;
 }
 
 void