// $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 "oneup.hpp"
#include "player.hpp"
#include "player_status.hpp"
#include "sector.hpp"
-#include "sprite/sprite_manager.hpp"
+#include "level.hpp"
+#include "statistics.hpp"
#include "video/drawing_context.hpp"
-OneUp::OneUp(const Vector& pos)
-{
- bbox.set_pos(pos);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create("1up");
- physic.set_velocity(100, 400);
- set_group(COLGROUP_TOUCHABLE);
-}
-
-OneUp::~OneUp()
+OneUp::OneUp(const Vector& pos, Direction direction)
+ : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
{
- delete sprite;
+ physic.set_velocity((direction == LEFT)?-100:100, -400);
}
void
if(!Sector::current()->inside(bbox))
remove_me();
- movement = physic.get_movement(elapsed_time);
-}
-
-void
-OneUp::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_OBJECTS);
+ movement = physic.get_movement(elapsed_time);
}
HitResponse
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
- player->get_status()->incLives();
+ player->get_status()->add_coins(100);
+#if 0
+ // FIXME: do we want this? q.v. src/level.cpp
+ Sector::current()->get_level()->stats.coins += 100;
+#endif
remove_me();
return ABORT_MOVE;
}
return FORCE_MOVE;
}
-