Optimized gradient when top color is the same as the bottom one.

[supertux.git] / src / moving_object.h

diff --git a/src/moving_object.h b/src/moving_object.h
index d8be47d..d9659a3 100644 (file)
--- a/src/moving_object.h
+++ b/src/moving_object.h
@@ -1,5 +1,24 @@
-#ifndef __MOVING_OBJECT_H__
-#define __MOVING_OBJECT_H__
+//  $Id$
+//
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2004 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.
+
+#ifndef SUPERTUX_MOVING_OBJECT_H
+#define SUPERTUX_MOVING_OBJECT_H
 
 #include "type.h"
 #include "game_object.h"
@@ -10,7 +29,7 @@
  * Base class for all dynamic/moving game objects. This class contains things
  * for handling the bounding boxes and collision feedback.
  */
-class MovingObject : public _GameObject
+class MovingObject : public GameObject
 {
 public:
   MovingObject();
@@ -21,6 +40,9 @@ public:
   virtual void collision(const MovingObject& other_object, 
           int collision_type) = 0;
 
+  Vector get_pos() const
+  { return Vector(base.x, base.y); }
+
   base_type base;
   base_type old_base;
 
@@ -35,5 +57,5 @@ protected:
 #endif
 };
 
-#endif
+#endif /*SUPERTUX_MOVING_OBJECT_H*/