Replaced USE_ALPHA/IGNORE_ALPHA by booleans.

[supertux.git] / src / background.cpp

diff --git a/src/background.cpp b/src/background.cpp
index 1effc16..78a9180 100644 (file)
--- a/src/background.cpp
+++ b/src/background.cpp
@@ -16,8 +16,8 @@
 //  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 "background.h"
 
+#include "background.h"
 #include "globals.h"
 #include "camera.h"
 #include "screen/drawing_context.h"
@@ -39,7 +39,7 @@ Background::Background(LispReader& reader)
   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", br)
+      && reader.read_int("bottom_green", bg)
       && reader.read_int("bottom_blue", bb)) {
     set_gradient(Color(tr, tg, tb), Color(br, bg, bb));
   }
@@ -86,7 +86,7 @@ Background::set_image(const std::string& name, float speed)
   this->speed = speed;
 
   delete image;
-  image = new Surface(datadir + "/images/background/" + name, IGNORE_ALPHA);
+  image = new Surface(datadir + "/images/background/" + name, false);
 }
 
 void
@@ -95,13 +95,26 @@ Background::set_gradient(Color top, Color bottom)
   type = GRADIENT;
   gradient_top = top;
   gradient_bottom = bottom;
+
+  delete image;
+  image = new Surface(top, bottom, screen->w, screen->h);
 }
 
 void
 Background::draw(DrawingContext& context)
 {
   if(type == GRADIENT) {
-    context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0);
+    /* In case we are using OpenGL just draw the gradient, else (software mode)
+        use the cache. */
+    if(use_gl)
+      context.draw_gradient(gradient_top, gradient_bottom, LAYER_BACKGROUND0);
+    else
+      {
+      context.push_transform();
+      context.set_translation(Vector(0, 0));
+      context.draw_surface(image, Vector(0, 0), LAYER_BACKGROUND0);
+      context.pop_transform();
+      }
   } else if(type == IMAGE) {
     int sx = int(-context.get_translation().x * speed)
       % image->w - image->w;