-converted remaining classes to GameObject

[supertux.git] / src / type.h

diff --git a/src/type.h b/src/type.h
index bc6e7c8..34b3206 100644 (file)
--- a/src/type.h
+++ b/src/type.h
@@ -31,46 +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
-{
-
-public:
-  GameObject() {};
-  virtual ~GameObject() {};
-  virtual void action(double frame_ratio) = 0;
-  virtual void draw() = 0;
-  virtual std::string type() = 0;
-  /* Draw ignoring the scroll_x value. FIXME: Hack? Should be discussed. @tobgle*/
-  void draw_on_screen(float x = -1, float y = -1)
-  {
-    base_type btmp = base;
-    if(x != -1 || y != -1)
-    {
-      btmp = base;
-      if(x != -1)
-        base.x = x;
-      if(y != -1)
-        base.y = y;
-    }
-    float tmp = scroll_x;
-    scroll_x = 0; draw();
-    scroll_x = tmp;
-    base = btmp;
-  };
-void move_to(float x, float y) { base.x = x; base.y = y; };
-
-  base_type base;
-  base_type old_base;
-};
-
 struct string_list_type
 {
   int num_items;
@@ -86,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*/