-// $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
// 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 "oneup.hpp"
-#include "resources.hpp"
-#include "player.hpp"
-#include "player_status.hpp"
-#include "sector.hpp"
-#include "video/drawing_context.hpp"
+#include "object/oneup.hpp"
+#include "object/player.hpp"
+#include "supertux/sector.hpp"
-OneUp::OneUp(const Vector& pos)
- : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
+OneUp::OneUp(const Vector& pos, Direction direction) :
+ MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE),
+ physic()
{
- physic.set_velocity(100, 400);
+ physic.set_velocity((direction == LEFT)?-100:100, -400);
+ if(direction == DOWN) // this causes the doll to drop when opened with a butt-jump
+ physic.set_velocity(0, -100);
}
void
if(!Sector::current()->inside(bbox))
remove_me();
- movement = physic.get_movement(elapsed_time);
+ movement = physic.get_movement(elapsed_time);
}
HitResponse
Player* player = dynamic_cast<Player*> (&other);
if(player) {
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;
}
+/* EOF */