* In the usage help, put LEVELFILE into brackets since it's an optional argument.

[supertux.git] / src / object / coin.cpp

diff --git a/src/object/coin.cpp b/src/object/coin.cpp
index c091018..d3eb1f5 100644 (file)
--- a/src/object/coin.cpp
+++ b/src/object/coin.cpp
@@ -1,21 +1,41 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 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>
 
-#include "coin.h"
-#include "resources.h"
-#include "video/drawing_context.h"
-#include "special/sprite_manager.h"
-#include "player.h"
-#include "sector.h"
-#include "scene.h"
-#include "gameobjs.h"
-#include "statistics.h"
-#include "object_factory.h"
+#include "coin.hpp"
+#include "resources.hpp"
+#include "video/drawing_context.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "player.hpp"
+#include "sector.hpp"
+#include "player_status.hpp"
+#include "gameobjs.hpp"
+#include "statistics.hpp"
+#include "object_factory.hpp"
 
 Coin::Coin(const Vector& pos)
 {
   bbox.set_pos(pos);
   bbox.set_size(32, 32);
   sprite = sprite_manager->create("coin");
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 Coin::Coin(const lisp::Lisp& reader)
@@ -24,6 +44,7 @@ Coin::Coin(const lisp::Lisp& reader)
   reader.get("y", bbox.p1.y);
   bbox.set_size(32, 32);
   sprite = sprite_manager->create("coin");
+  set_group(COLGROUP_TOUCHABLE);
 }
 
 Coin::~Coin()
@@ -32,7 +53,7 @@ Coin::~Coin()
 }
 
 void
-Coin::action(float )
+Coin::update(float )
 {
 }
 
@@ -45,7 +66,7 @@ Coin::draw(DrawingContext& context)
 void
 Coin::collect()
 {
-  Sector::current()->player->get_status().incCoins();
+  Sector::current()->player->get_status()->incCoins();
   Sector::current()->add_object(new BouncyCoin(get_pos()));
   global_stats.add_points(COINS_COLLECTED_STAT, 1);
   remove_me();