fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/object/display_effect.cpp b/src/object/display_effect.cpp
index c2b1538..ca3125d 100644 (file)
--- a/src/object/display_effect.cpp
+++ b/src/object/display_effect.cpp
@@ -1,9 +1,28 @@
+//  $Id$
+//
+//  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
+//  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 <config.h>
 #include "display_effect.hpp"
 
 #include <assert.h>
 #include "video/drawing_context.hpp"
-#include "scripting/wrapper_util.hpp"
+#include "scripting/squirrel_util.hpp"
 #include "main.hpp"
 
 static const float BORDER_SIZE = 75;
@@ -20,14 +39,14 @@ DisplayEffect::~DisplayEffect()
 }
 
 void
-DisplayEffect::expose(HSQUIRRELVM vm, int table_idx)
+DisplayEffect::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   Scripting::DisplayEffect* interface = static_cast<Scripting::DisplayEffect*> (this);
   expose_object(vm, table_idx, interface, "Effect", false);
 }
 
 void
-DisplayEffect::unexpose(HSQUIRRELVM vm, int table_idx)
+DisplayEffect::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
   try {
     Scripting::unexpose_object(vm, table_idx, "Effect");
@@ -75,12 +94,12 @@ DisplayEffect::update(float elapsed_time)
                 borders = false;
                 border_fade = NO_FADE;
             }
-            border_size = (border_fadetime - border_fading) 
+            border_size = (border_fadetime - border_fading)
                 / border_fadetime * BORDER_SIZE;
             break;
         default:
             assert(false);
-    }       
+    }
 }
 
 void
@@ -89,7 +108,7 @@ DisplayEffect::draw(DrawingContext& context)
     context.push_transform();
     context.set_translation(Vector(0, 0));
 
-    if(black || screen_fade != NO_FADE) {    
+    if(black || screen_fade != NO_FADE) {
       float alpha;
       if(black) {
           alpha = 1.0f;
@@ -177,4 +196,3 @@ DisplayEffect::four_to_three(float fadetime)
     border_fading = border_fadetime;
   }
 }
-