converted all sound files to .ogg (to avoid problems with different sampling rates...

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

diff --git a/src/object/bullet.cpp b/src/object/bullet.cpp
index 5a7a1d4..94b20a1 100644 (file)
--- a/src/object/bullet.cpp
+++ b/src/object/bullet.cpp
@@ -1,13 +1,32 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 <math.h>
-#include "bullet.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "app/globals.h"
-#include "special/sprite_manager.h"
-#include "badguy/badguy.h"
+#include "bullet.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "badguy/badguy.hpp"
+#include "main.hpp"
 
 static const float BULLET_XM = 300;
 static const float BULLET_STARTING_YM = 0;
@@ -36,7 +55,7 @@ Bullet::~Bullet()
 }
 
 void
-Bullet::action(float elapsed_time)
+Bullet::update(float elapsed_time)
 {
   if(kind == FIRE_BULLET) {
     // @not completely framerate independant :-/
@@ -93,7 +112,6 @@ Bullet::collision(GameObject& other, const CollisionHit& hit)
     return FORCE_MOVE;
   }
  
-  // TODO kill badguys
   return FORCE_MOVE;
 }