X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flevel.cpp;h=4bdf1b40aec33460f3f4e7efd531796dbe06ecad;hb=1535e8fcef06a4d211c9c1296460a595797d8012;hp=b83bdb4c92582d55fffc7ef6afe958fa04c0829a;hpb=c09f7145be9014f0e276c9b5421f7bc198aa1242;p=supertux.git diff --git a/src/level.cpp b/src/level.cpp index b83bdb4c9..4bdf1b40a 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -1,14 +1,22 @@ +// $Id$ +// +// SuperTux +// Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details // -// C Implementation: level -// -// Description: -// -// -// Author: Tobias Glaesser , (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. #include #include @@ -23,6 +31,8 @@ #include "scene.h" #include "tile.h" #include "lispreader.h" +#include "resources.h" +#include "music_manager.h" using namespace std; @@ -117,6 +127,7 @@ void st_subset::load(char *subset) } + lisp_free(root_obj); fclose(fi); snprintf(str, 1024, "%s.png", filename); @@ -191,19 +202,28 @@ void st_subset::free() } Level::Level() + : img_bkgd(0) { + init_defaults(); } Level::Level(const std::string& subset, int level) + : img_bkgd(0) { load(subset, level); } Level::Level(const std::string& filename) + : img_bkgd(0) { load(filename); } +Level::~Level() +{ + free_gfx(); +} + void Level::init_defaults() { @@ -213,6 +233,8 @@ Level::init_defaults() song_title = "Mortimers_chipdisko.mod"; bkgd_image = "arctis.png"; width = 21; + start_pos_x = 100; + start_pos_y = 170; time_left = 100; gravity = 10.; bkgd_top.red = 0; @@ -222,6 +244,7 @@ Level::init_defaults() bkgd_bottom.green = 255; bkgd_bottom.blue = 255; endpos = 0; + use_endsequence = false; for(int i = 0; i < 15; ++i) { @@ -285,18 +308,20 @@ Level::load(const std::string& filename) if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { LispReader reader(lisp_cdr(root_obj)); - reader.read_int("version", &version); + reader.read_bool("use-endsequence", &use_endsequence); reader.read_int("width", &width); + if (!reader.read_int("start_pos_x", &start_pos_x)) start_pos_x = 100; + if (!reader.read_int("start_pos_y", &start_pos_y)) start_pos_y = 170; reader.read_int("time", &time_left); - reader.read_int("bkgd_top_red", &bkgd_top.red); - reader.read_int("bkgd_top_green", &bkgd_top.green); - reader.read_int("bkgd_top_blue", &bkgd_top.blue); + reader.read_int("bkgd_red_top", &bkgd_top.red); + reader.read_int("bkgd_green_top", &bkgd_top.green); + reader.read_int("bkgd_blue_top", &bkgd_top.blue); - reader.read_int("bkgd_bottom_red", &bkgd_bottom.red); - reader.read_int("bkgd_bottom_green", &bkgd_bottom.green); - reader.read_int("bkgd_bottom_blue", &bkgd_bottom.blue); + reader.read_int("bkgd_red_bottom", &bkgd_bottom.red); + reader.read_int("bkgd_green_bottom", &bkgd_bottom.green); + reader.read_int("bkgd_blue_bottom", &bkgd_bottom.blue); reader.read_float("gravity", &gravity); reader.read_string("name", &name); @@ -312,7 +337,29 @@ Level::load(const std::string& filename) reader.read_int_vector("foreground-tm", &fg_tm); - { + { // Read ResetPoints + lisp_object_t* cur = 0; + if (reader.read_lisp("reset-points", &cur)) + { + while (!lisp_nil_p(cur)) + { + lisp_object_t* data = lisp_car(cur); + + ResetPoint pos; + + LispReader reader(lisp_cdr(data)); + if (reader.read_int("x", &pos.x) + && reader.read_int("y", &pos.y)) + { + reset_points.push_back(pos); + } + + cur = lisp_cdr(cur); + } + } + } + + { // Read BadGuys lisp_object_t* cur = 0; if (reader.read_lisp("objects", &cur)) { @@ -325,6 +372,7 @@ Level::load(const std::string& filename) LispReader reader(lisp_cdr(data)); reader.read_int("x", &bg_data.x); reader.read_int("y", &bg_data.y); + reader.read_bool("stay-on-platform", &bg_data.stay_on_platform); badguy_data.push_back(bg_data); @@ -383,7 +431,7 @@ Level::load(const std::string& filename) if (*i == '0' || *i == '1' || *i == '2') { badguy_data.push_back(BadGuyData(static_cast(*i-'0'), - x*32, y*32)); + x*32, y*32, false)); *i = 0; } else @@ -450,8 +498,12 @@ Level::load(const std::string& filename) // Mark the end position of this level! // FIXME: -10 is a rather random value, we still need some kind of // real levelend gola - endpos = 32*(width-10); + if (use_endsequence) + endpos = 32*(width-20); + else + endpos = 32*(width-15); + lisp_free(root_obj); fclose(fi); return 0; } @@ -491,12 +543,12 @@ Level::save(const char * subset, int level) fprintf(fi," (music \"%s\")\n", song_title.c_str()); fprintf(fi," (background \"%s\")\n", bkgd_image.c_str()); fprintf(fi," (particle_system \"%s\")\n", particle_system.c_str()); - fprintf(fi," (bkgd_top_red %d)\n", bkgd_top.red); - fprintf(fi," (bkgd_top_green %d)\n", bkgd_top.green); - fprintf(fi," (bkgd_top_blue %d)\n", bkgd_top.blue); - fprintf(fi," (bkgd_bottom_red %d)\n", bkgd_bottom.red); - fprintf(fi," (bkgd_bottom_green %d)\n", bkgd_bottom.green); - fprintf(fi," (bkgd_bottom_blue %d)\n", bkgd_bottom.blue); + fprintf(fi," (bkgd_red_top %d)\n", bkgd_top.red); + fprintf(fi," (bkgd_green_top %d)\n", bkgd_top.green); + fprintf(fi," (bkgd_blue_top %d)\n", bkgd_top.blue); + fprintf(fi," (bkgd_red_bottom %d)\n", bkgd_bottom.red); + fprintf(fi," (bkgd_green_bottom %d)\n", bkgd_bottom.green); + fprintf(fi," (bkgd_blue_bottom %d)\n", bkgd_bottom.blue); fprintf(fi," (time %d)\n", time_left); fprintf(fi," (width %d)\n", width); fprintf(fi," (gravity %2.1f)\n", gravity); @@ -527,12 +579,21 @@ Level::save(const char * subset, int level) } fprintf( fi,")\n"); + + fprintf( fi,"(reset-points\n"); + for(std::vector::iterator i = reset_points.begin(); + i != reset_points.end(); ++i) + fprintf( fi,"(point (x %d) (y %d))\n",i->x, i->y); + fprintf( fi,")\n"); + fprintf( fi,"(objects\n"); for(std::vector::iterator it = badguy_data.begin(); it != badguy_data.end(); ++it) - fprintf( fi,"(%s (x %d) (y %d))\n",badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y); + fprintf( fi,"(%s (x %d) (y %d) (stay-on-platform %s))\n", + badguykind_to_string((*it).kind).c_str(),(*it).x,(*it).y, + it->stay_on_platform ? "#t" : "#f"); fprintf( fi,")\n"); @@ -554,6 +615,7 @@ Level::cleanup() fg_tiles[i].clear(); } + reset_points.clear(); name.clear(); author.clear(); theme.clear(); @@ -576,8 +638,7 @@ Level::load_gfx() } else { - /* Quick hack to make sure an image is loaded, when we are freeing it afterwards. */ - load_image(&img_bkgd, theme,"solid0.png", IGNORE_ALPHA); + img_bkgd = 0; } } @@ -640,20 +701,13 @@ Level::change(float x, float y, int tm, unsigned int c) } } -void -Level::free_song(void) -{ - free_music(level_song); - free_music(level_song_fast); -} - void Level::load_song() { char* song_path; char* song_subtitle; - level_song = ::load_song(datadir + "/music/" + song_title); + level_song = music_manager->load_music(datadir + "/music/" + song_title); song_path = (char *) malloc(sizeof(char) * datadir.length() + strlen(song_title.c_str()) + 8 + 5); @@ -661,11 +715,27 @@ Level::load_song() strcpy(strstr(song_subtitle, "."), "\0"); sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), song_subtitle, strstr(song_title.c_str(), ".")); - level_song_fast = ::load_song(song_path); + if(!music_manager->exists_music(song_path)) { + level_song_fast = level_song; + } else { + level_song_fast = music_manager->load_music(song_path); + } free(song_subtitle); free(song_path); } +MusicRef +Level::get_level_music() +{ + return level_song; +} + +MusicRef +Level::get_level_music_fast() +{ + return level_song_fast; +} + unsigned int Level::gettileid(float x, float y) {