X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.h;h=fa71bbce3b714d74249ae8a20dec5e026e131fda;hb=f00cab0c347263a82758e8c6799f28e80d6162f2;hp=0403e2f624d0d2730500a5d9f8bae95f160dcdef;hpb=45d21c1c59a58aa557b62d3aa22ba89a975e323c;p=supertux.git

diff --git a/src/worldmap.h b/src/worldmap.h
index 0403e2f62..fa71bbce3 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -26,14 +26,17 @@
 #include "audio/musicref.h"
 #include "video/screen.h"
 #include "lisp/lisp.h"
+#include "control/controller.h"
 #include "statistics.h"
 #include "timer.h"
 #include "tile_manager.h"
+#include "game_object.h"
 
-namespace SuperTux {
-  class Menu;
-}
-
+class Sprite;
+class Menu;
+class SpawnPoint;
+class GameObject;
+class TileMap;
 extern Menu* worldmap_menu;
 
 namespace WorldMapNS {
@@ -60,15 +63,14 @@ Direction reverse_dir(Direction d);
 
 class WorldMap;
 
-class Tux
+class Tux : public GameObject
 {
 public:
   Direction back_direction;
 private:
   WorldMap* worldmap;
-  Surface* largetux_sprite;
-  Surface* firetux_sprite;
-  Surface* smalltux_sprite;
+  Sprite* tux_sprite;
+  Controller* controller;
 
   Direction input_direction;
   Direction direction;
@@ -83,8 +85,8 @@ public:
   Tux(WorldMap* worldmap_);
   ~Tux();
   
-  void draw(DrawingContext& context, const Vector& offset);
-  void action(float elapsed_time);
+  void draw(DrawingContext& context);
+  void update(float elapsed_time);
 
   void set_direction(Direction dir);
 
@@ -110,13 +112,10 @@ private:
   std::string name;
   std::string music;
 
-  std::vector<int> tilemap;
-  int width;
-  int height;
+  typedef std::vector<GameObject*> GameObjects;
+  GameObjects game_objects;
+  TileMap* solids;
   
-  int start_x;
-  int start_y;
-
   TileManager* tile_manager;
 
 public:
@@ -159,9 +158,8 @@ public:
     /** Check if this level should be vertically flipped */
     bool vertical_flip;
 
-    /** Filename of the extro text to show once the level is
-        successfully completed */
-    std::string extro_filename;
+    /** Script that is run when the level is successfully finished */
+    std::string extro_script;
 
     /** Go to this world */
     std::string next_worldmap;
@@ -180,7 +178,7 @@ public:
   };
 
   /** Variables to deal with the passive map messages */
-  Timer2 passive_message_timer;
+  Timer passive_message_timer;
   std::string passive_message;
 
 private:
@@ -189,16 +187,18 @@ private:
 
   typedef std::vector<SpecialTile> SpecialTiles;
   SpecialTiles special_tiles;
-
   typedef std::vector<Level> Levels;
   Levels levels;
+  typedef std::vector<SpawnPoint*> SpawnPoints;
+  SpawnPoints spawn_points;
 
   MusicRef song;
 
-  bool enter_level;
-
   Vector offset;
   std::string savegame_file;
+  
+  std::string intro_script;
+  bool intro_displayed;
 
   void get_level_title(Level& level);
 
@@ -220,11 +220,14 @@ public:
   
   void get_input();
 
+  void add_object(GameObject* object);
+  void clear_objects();
+
   /** Update Tux position */
   void update(float delta);
 
   /** Draw one frame */
-  void draw(DrawingContext& context, const Vector& offset);
+  void draw(DrawingContext& context);
 
   Vector get_next_tile(Vector pos, Direction direction);
   const Tile* at(Vector pos);
@@ -245,20 +248,15 @@ public:
   void loadmap(const std::string& filename);
 
   const std::string& get_world_title() const
-    { return name; }
+  { return name; }
     
-  const int& get_start_x() const
-    { return start_x; }
-  
-  const int& get_start_y() const
-    { return start_y; }
-
   void set_map_filename(std::string filename)
-    { map_filename = filename; }
+  { map_filename = filename; }
 
 private:
   void on_escape_press();
-  void parse_special_tiles(const lisp::Lisp* lisp);
+  void parse_special_tile(const lisp::Lisp* lisp);
+  void parse_level_tile(const lisp::Lisp* lisp);
 };
 
 } // namespace WorldMapNS