Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / trigger / trigger_base.cpp

diff --git a/src/trigger/trigger_base.cpp b/src/trigger/trigger_base.cpp
index 1942f63..85a9a0e 100644 (file)
--- a/src/trigger/trigger_base.cpp
+++ b/src/trigger/trigger_base.cpp
@@ -1,12 +1,10 @@
-//  $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
@@ -14,19 +12,17 @@
 //  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 "trigger_base.hpp"
+#include "trigger/trigger_base.hpp"
 
-#include "sprite/sprite.hpp"
-#include "video/drawing_request.hpp"
 #include "object/player.hpp"
+#include "sprite/sprite.hpp"
 
-TriggerBase::TriggerBase()
-  : sprite(0), lasthit(false), hit(false)
+TriggerBase::TriggerBase() :
+  sprite(),
+  lasthit(false), 
+  hit(false)
 {
   set_group(COLGROUP_TOUCHABLE);
 }
@@ -59,7 +55,7 @@ TriggerBase::update(float )
 void
 TriggerBase::draw(DrawingContext& context)
 {
-  if(!sprite)
+  if(!sprite.get())
     return;
 
   sprite->draw(context, get_pos(), LAYER_TILES+1);
@@ -93,3 +89,4 @@ TriggerBase::object_removed(GameObject* object)
   }
 }
 
+/* EOF */