-#include <config.h>
-
-#include "oneup.h"
-#include "resources.h"
-#include "player.h"
-#include "player_status.h"
-#include "sector.h"
-#include "special/sprite_manager.h"
-#include "video/drawing_context.h"
-
-OneUp::OneUp(const Vector& pos)
-{
- bbox.set_pos(pos);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create("1up");
- physic.set_velocity(100, 400);
-}
-
-OneUp::~OneUp()
+// 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 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, see <http://www.gnu.org/licenses/>.
+
+#include "object/oneup.hpp"
+#include "object/player.hpp"
+#include "supertux/sector.hpp"
+
+OneUp::OneUp(const Vector& pos, Direction direction) :
+ MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE),
+ physic()