[cppcheck] Part 1: Performance

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

diff --git a/src/object/rainsplash.cpp b/src/object/rainsplash.cpp
index d53e531..62ba8e1 100644 (file)
--- a/src/object/rainsplash.cpp
+++ b/src/object/rainsplash.cpp
@@ -1,30 +1,30 @@
 //  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 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 3 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 "rainsplash.hpp"
-#include "sector.hpp"
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "object/rainsplash.hpp"
 
-RainSplash::RainSplash(Vector pos, bool vertical)
+RainSplash::RainSplash(Vector pos, bool vertical) :
+  sprite(),
+  position(pos),
+  frame(0)
 {
-  frame = 0;
-  position = pos;
-  if (vertical) sprite = sprite_manager->create("images/objects/particles/rainsplash-vertical.sprite");
-  else sprite = sprite_manager->create("images/objects/particles/rainsplash.sprite");
+  if (vertical) sprite = SpriteManager::current()->create("images/objects/particles/rainsplash-vertical.sprite");
+  else sprite = SpriteManager::current()->create("images/objects/particles/rainsplash.sprite");
 }
-  
+
 RainSplash::~RainSplash() {
   remove_me();
 }
@@ -35,15 +35,17 @@ RainSplash::hit(Player& )
 }
 
 void
-RainSplash::update(float time) 
+RainSplash::update(float time)
 {
-  time = 0;//just so i don't get an "unused variable" error - don't know how to circumvent this
+  (void) time;
   frame++;
   if (frame >= 10) remove_me();
 }
 
 void
-RainSplash::draw(DrawingContext& context) 
+RainSplash::draw(DrawingContext& context)
 {
-   sprite->draw(context, position, LAYER_OBJECTS);
+  sprite->draw(context, position, LAYER_OBJECTS);
 }
+
+/* EOF */