X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fgrowup.cpp;h=50d16ea48f6fbbfbb1adf624e3f6e2a896b9df43;hb=83c5812ba15bc66c3dc6ae1c3fc59ab29978e514;hp=6f0fe5ecb7009887bcc084d354962e062f445619;hpb=6afe39823a25f6bf06f715205c1f51ddbe6cefae;p=supertux.git

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 6f0fe5ecb..50d16ea48 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -1,45 +1,42 @@
-//  $Id$
-// 
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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 <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <math.h>
-#include "growup.hpp"
-#include "resources.hpp"
-#include "camera.hpp"
-#include "sector.hpp"
-#include "player.hpp"
+
 #include "audio/sound_manager.hpp"
+#include "object/growup.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 
-GrowUp::GrowUp()
+GrowUp::GrowUp(Direction direction) :
+  MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING),
+  physic(),
+  light(0.0f,0.0f,0.0f),
+  shadesprite(SpriteManager::current()->create("images/powerups/egg/egg.sprite")),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
-  bbox.set_size(32, 32);
-  
-  sprite = sprite_manager->create("egg");
   physic.enable_gravity(true);
-  physic.set_velocity_x(100);
-}
-
-GrowUp::~GrowUp()
-{
-  delete sprite;
+  physic.set_velocity_x((direction == LEFT)?-100:100);
+  SoundManager::current()->preload("sounds/grow.ogg");
+  //shadow to remain in place as egg rolls
+  shadesprite->set_action("shadow");
+  //set light for glow effect
+  lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
+  lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
 }
 
 void
@@ -48,25 +45,53 @@ GrowUp::update(float elapsed_time)
   movement = physic.get_movement(elapsed_time);
 }
 
-HitResponse
-GrowUp::collision(GameObject& other, const CollisionHit& hit)
+void
+GrowUp::draw(DrawingContext& context)
 {
-  if(other.get_flags() & FLAG_SOLID) {
-    if(fabsf(hit.normal.y) > .5) { // roof or ground
-      physic.set_velocity_y(0);
-    } else { // bumped left or right
-      physic.set_velocity_x(-physic.get_velocity_x());
-    }
+  if(physic.get_velocity_x() != 0) {
+    //Set Sprite rotation angle
+    sprite->set_angle(get_pos().x * 360.0f / (32.0f * M_PI));
+  }
+  //Draw the Sprite.
+  MovingSprite::draw(context);
+  //Draw shade
+  shadesprite->draw(context, get_pos(), layer+1);
+  //Draw the light when dark
+  context.get_light( get_bbox().get_middle(), &light );
+  if (light.red + light.green < 2.0){
+    context.push_target();
+    context.set_target(DrawingContext::LIGHTMAP);
+    lightsprite->draw(context, get_bbox().get_middle(), 0);
+    context.pop_target();
+  }
+}
 
-    return CONTINUE;
+void
+GrowUp::collision_solid(const CollisionHit& hit)
+{
+  if(hit.top)
+    physic.set_velocity_y(0);
+  if(hit.bottom && physic.get_velocity_y() > 0)
+    physic.set_velocity_y(0);
+  if(hit.left || hit.right) {
+    physic.set_velocity_x(-physic.get_velocity_x());
   }
-  
+}
+
+HitResponse
+GrowUp::collision(GameObject& other, const CollisionHit& hit )
+{
   Player* player = dynamic_cast<Player*>(&other);
   if(player != 0) {
-    player->set_bonus(GROWUP_BONUS, true);
-    sound_manager->play("sounds/grow.wav");
+    if(!player->add_bonus(GROWUP_BONUS, true)) {
+      // Tux can't grow right now.
+      collision_solid( hit );
+      return ABORT_MOVE;
+    }
+
+    SoundManager::current()->play("sounds/grow.ogg");
     remove_me();
-    
+
     return ABORT_MOVE;
   }
 
@@ -74,8 +99,9 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit)
 }
 
 void
-GrowUp::draw(DrawingContext& context)
+GrowUp::do_jump()
 {
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  physic.set_velocity_y(-300);
 }
 
+/* EOF */