// $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
// 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.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
#include <config.h>
#include <math.h>
-#include "growup.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "sprite/sprite_manager.h"
+#include "growup.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite_manager.hpp"
-GrowUp::GrowUp(const Vector& pos)
+GrowUp::GrowUp()
{
- bbox.set_pos(pos);
bbox.set_size(32, 32);
- sprite = sprite_manager->create("egg");
+ sprite = sprite_manager->create("images/powerups/egg/egg.sprite");
physic.enable_gravity(true);
physic.set_velocity_x(100);
+ set_group(COLGROUP_MOVING);
}
GrowUp::~GrowUp()
}
void
-GrowUp::action(float elapsed_time)
+GrowUp::update(float elapsed_time)
{
movement = physic.get_movement(elapsed_time);
}
Player* player = dynamic_cast<Player*>(&other);
if(player != 0) {
- player->set_bonus(GROWUP_BONUS, true);
- sound_manager->play_sound("grow");
+ player->add_bonus(GROWUP_BONUS, true);
+ sound_manager->play("sounds/grow.wav");
remove_me();
return ABORT_MOVE;