Limitated the number of bullets to be shot at the same time.

[supertux.git] / src / screen.cpp

diff --git a/src/screen.cpp b/src/screen.cpp
index d757eac..d9243f8 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1,14 +1,21 @@
-/*
-  screen.c
-  
-  Super Tux - Screen Functions
-  
-  by Bill Kendrick
-  bill@newbreedsoftware.com
-  http://www.newbreedsoftware.com/supertux/
-  
-  April 11, 2000 - March 15, 2004
-*/
+//  $Id$
+//
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2000 Bill Kendrick <bill@newbreedsoftware.com>
+//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  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 <stdio.h>
 #include <stdlib.h>
@@ -56,16 +63,16 @@ void clearscreen(int r, int g, int b)
 
 /* --- DRAWS A VERTICAL GRADIENT --- */
 
-void drawgradient(int top_r, int top_g, int top_b, int bot_r, int bot_g, int bot_b)
+void drawgradient(Color top_clr, Color bot_clr)
 {
 #ifndef NOOPENGL
   if(use_gl)
     {
       glBegin(GL_QUADS);
-      glColor3ub(top_r, top_g, top_b);
+      glColor3ub(top_clr.red, top_clr.green, top_clr.blue);
       glVertex2f(0, 0);
       glVertex2f(640, 0);
-      glColor3ub(bot_r, bot_g, bot_b);
+      glColor3ub(bot_clr.red, bot_clr.green, bot_clr.blue);
       glVertex2f(640, 480);
       glVertex2f(0, 480);
       glEnd();
@@ -74,17 +81,11 @@ void drawgradient(int top_r, int top_g, int top_b, int bot_r, int bot_g, int bot
   {
 #endif
 
-  SDL_Rect r;
-  r.x = 0;
-  r.w = 640;
-  r.h = 2;
-
     for(float y = 0; y < 480; y += 2)
-      {
-      r.y = (int)y;
-
-      SDL_FillRect(screen, &r, SDL_MapRGB(screen->format, (int)(((float)(top_r-bot_r)/640) * y + top_r), (int)(((float)(top_g-bot_g)/640) * y + top_g), (int)(((float)(top_b-bot_b)/640) * y + top_b)));
-      }
+      fillrect(0, (int)y, 640, 2,
+                     (int)(((float)(top_clr.red-bot_clr.red)/(0-480)) * y + top_clr.red),
+                     (int)(((float)(top_clr.green-bot_clr.green)/(0-480)) * y + top_clr.green),
+                     (int)(((float)(top_clr.blue-bot_clr.blue)/(0-480)) * y + top_clr.blue), 255);
 /* calculates the color for each line, based in the generic equation for functions: y = mx + b */
 
 #ifndef NOOPENGL