X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flevel.h;h=ac503ed16e675e6eee92ecc017f00ed0f84f461b;hb=90b85c87d5da62881fcb51b1f1b6767beb50d11f;hp=682c5692553ddde8c2be6b43cff67369eab07487;hpb=945d6ee4488595f3a8f7180b66b53ff684ab94e4;p=supertux.git

diff --git a/src/level.h b/src/level.h
index 682c56925..ac503ed16 100644
--- a/src/level.h
+++ b/src/level.h
@@ -1,14 +1,22 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
 //
-// C Interface: level
-//
-// Description:
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2003
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  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_LEVEL_H
 #define SUPERTUX_LEVEL_H
@@ -17,6 +25,7 @@
 #include "texture.h"
 #include "badguy.h"
 #include "lispreader.h"
+#include "musicref.h"
 
 class Tile;
 
@@ -34,7 +43,7 @@ class st_subset
     std::string name;
     std::string title;
     std::string description;
-    texture_type image;
+    Surface* image;
     int levels;
  
   private:
@@ -50,33 +59,48 @@ enum TileMapType {
  TM_FG
  };
 
-extern texture_type img_bkgd;
+struct ResetPoint
+{
+  int x;
+  int y;
+};
 
-/*
-extern texture_type img_bkgd_tile[2][4];
-extern texture_type img_solid[4];
-extern texture_type img_brick[2];
-*/
 class Level 
 {
  public:
+  Surface* img_bkgd;
+  MusicRef level_song;
+  MusicRef level_song_fast;
+
   std::string name;
+  std::string author;
   std::string theme;
   std::string song_title;
   std::string bkgd_image;
   std::string particle_system;
-  unsigned int* bg_tiles[15]; /* Tiles in the background */
-  unsigned int* ia_tiles[15]; /* Tiles which can interact in the game (solids for example)*/
-  unsigned int* fg_tiles[15]; /* Tiles in the foreground */
+  std::vector<unsigned int> bg_tiles[15]; /* Tiles in the background */
+  std::vector<unsigned int> ia_tiles[15]; /* Tiles which can interact in the game (solids for example)*/
+  std::vector<unsigned int> fg_tiles[15]; /* Tiles in the foreground */
   int time_left;
-  int bkgd_red;
-  int bkgd_green;
-  int bkgd_blue;
+  Color bkgd_top;
+  Color bkgd_bottom;
   int width;
+  int start_pos_x;
+  int start_pos_y;
+  int  endpos;
+  bool use_endsequence;
   float gravity;
 
   std::vector<BadGuyData> badguy_data;
+
+  /** A collection of points to which Tux can be reset after a lost live */
+  std::vector<ResetPoint> reset_points;
  public:
+  Level();
+  Level(const std::string& subset, int level);
+  Level(const std::string& filename);
+  ~Level();
+
   /** Will the Level structure with default values */
   void init_defaults();
   
@@ -85,14 +109,19 @@ class Level
 
   /** Load data for this level: 
       Returns -1, if the loading of the level failed. */
-  int  load(const char* subset, int level);
+  int  load(const std::string& subset, int level);
 
   /** Load data for this level: 
       Returns -1, if the loading of the level failed. */
   int  load(const std::string& filename);
 
   void load_gfx();
+  void free_gfx();
+  
   void load_song();
+  void free_song();
+  MusicRef get_level_music();
+  MusicRef get_level_music_fast();
 
   void save(const char* subset, int level);
 
@@ -104,10 +133,8 @@ class Level
 
   /** Return the id of the tile at position x/y */
   unsigned int gettileid(float x, float y);
-};
 
-void level_load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
-void level_free_song();
-void level_free_gfx();
+  void load_image(Surface** ptexture, std::string theme, const char * file, int use_alpha);
+};
 
 #endif /*SUPERTUX_LEVEL_H*/