Modified conditions in which Tux can release objects.

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

diff --git a/src/object/star.cpp b/src/object/star.cpp
index e6ef934..f421d43 100644 (file)
--- a/src/object/star.cpp
+++ b/src/object/star.cpp
@@ -1,12 +1,10 @@
-//  $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 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
@@ -14,26 +12,20 @@
 //  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>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "star.hpp"
-#include "resources.hpp"
-#include "player.hpp"
-#include "player_status.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "video/drawing_context.hpp"
+#include "object/player.hpp"
+#include "object/star.hpp"
 
 static const float INITIALJUMP = -400;
-static const float SPEED = 150;
-static const float JUMPSPEED = -300;
+static const float STAR_SPEED = 150;
+static const float JUMPSTAR_SPEED = -300;
 
-Star::Star(const Vector& pos)
-       : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
+Star::Star(const Vector& pos, Direction direction) :
+  MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING),
+  physic()
 {
-  physic.set_velocity(SPEED, INITIALJUMP);
+  physic.set_velocity((direction == LEFT) ? -STAR_SPEED : STAR_SPEED, INITIALJUMP);
 }
 
 void
@@ -42,21 +34,21 @@ Star::update(float elapsed_time)
   movement = physic.get_movement(elapsed_time);
 }
 
-HitResponse
-Star::collision(GameObject& other, const CollisionHit& hit)
+void
+Star::collision_solid(const CollisionHit& hit)
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(hit.normal.y < -.5) { // ground
-      physic.set_velocity_y(JUMPSPEED);
-    } else if(hit.normal.y > .5) { // roof
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
-
-    return CONTINUE;
+  if(hit.bottom) {
+    physic.set_velocity_y(JUMPSTAR_SPEED);
+  } else if(hit.top) {
+    physic.set_velocity_y(0);
+  } else if(hit.left || hit.right) {
+    physic.set_velocity_x(-physic.get_velocity_x());
   }
-  
+}
+
+HitResponse
+Star::collision(GameObject& other, const CollisionHit& )
+{
   Player* player = dynamic_cast<Player*> (&other);
   if(player) {
     player->make_invincible();
@@ -67,3 +59,4 @@ Star::collision(GameObject& other, const CollisionHit& hit)
   return FORCE_MOVE;
 }
 
+/* EOF */