-converted remaining classes to GameObject

[supertux.git] / src / type.h

diff --git a/src/type.h b/src/type.h
index 6906ecf..34b3206 100644 (file)
--- a/src/type.h
+++ b/src/type.h
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
@@ -12,7 +12,7 @@
 //  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
@@ -23,6 +23,7 @@
 
 #include <string>
 #include "SDL.h"
+#include "scene.h"
 
 /* 'Base' type for game objects */
 
@@ -30,48 +31,10 @@ struct base_type
 {
   float x;
   float y;
-  float xm;
-  float ym;
   float width;
   float height;
 };
 
-
-/* Base class for all dynamic game object. */
-class GameObject
-{
-
-friend bool operator<(const GameObject& lhs, const GameObject& rhs)
-{
- if( lhs.base.x < rhs.base.x )
- return true;
- else if( lhs.base.x == rhs.base.x && lhs.base.y < rhs.base.y)
- return true;
- else
- return false;
-}
-
-friend bool operator>(const GameObject& lhs, const GameObject& rhs)
-{
- if( lhs.base.x > rhs.base.x )
- return true;
- else if( lhs.base.x == rhs.base.x && lhs.base.y > rhs.base.y)
- return true;
- else
- return false;
-}
-
-public:
-GameObject() {};
-virtual ~GameObject() {};
-virtual void action(double frame_ratio) = 0;
-virtual void draw() = 0;
-virtual std::string type() = 0;
-
-base_type base;
-base_type old_base;
-};
-
 struct string_list_type
 {
   int num_items;
@@ -87,5 +50,7 @@ void  string_list_sort(string_list_type* pstring_list);
 void  string_list_add_item(string_list_type* pstring_list, const char* str);
 void  string_list_free(string_list_type* pstring_list);
 
+
+
 #endif /*SUPERTUX_TYPE_H*/