From: Ingo Ruhnke Date: Sun, 28 Mar 2004 12:41:11 +0000 (+0000) Subject: - removed next_tile2, which isn't needed X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a337d4bb501ebe304a694aa4e0592a5201df481e;p=supertux.git - removed next_tile2, which isn't needed - added --sdl option to turn of opengl in case it is on in the config file SVN-Revision: 404 --- diff --git a/src/gameloop.cpp b/src/gameloop.cpp index 630ef3d83..3c84ebbf6 100644 --- a/src/gameloop.cpp +++ b/src/gameloop.cpp @@ -1171,7 +1171,7 @@ void drawshape(float x, float y, unsigned int c) } else { - printf("Tile not dravable %u\n", c); + //printf("Tile not dravable %u\n", c); } } } @@ -1363,7 +1363,7 @@ void trybreakbrick(float x, float y) } if (distro_counter <= 0) - level_change(¤t_level,x, y, TM_IA, tile->next_tile2); + level_change(¤t_level,x, y, TM_IA, tile->next_tile); play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER); score = score + SCORE_DISTRO; diff --git a/src/setup.cpp b/src/setup.cpp index 60e5695ac..15e6ba037 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -929,8 +929,11 @@ void parseargs(int argc, char * argv[]) use_gl = true; #endif - } + else if (strcmp(argv[i], "--sdl") == 0) + { + use_gl = false; + } else if (strcmp(argv[i], "--usage") == 0) { /* Show usage: */ @@ -971,6 +974,7 @@ void parseargs(int argc, char * argv[]) " --fullscreen Run in fullscreen mode.\n" " --opengl If opengl support was compiled in, this will enable\n" " the EXPERIMENTAL OpenGL mode.\n" + " --sdl Use non-opengl renderer\n" "\n" "Sound Options:\n" " --disable-sound If sound support was compiled in, this will\n" diff --git a/src/tile.cpp b/src/tile.cpp index 50ccb66fd..2f3916e04 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -48,7 +48,6 @@ void TileManager::load_tileset(std::string filename) tile->data = 0; tile->alpha = 0; tile->next_tile = 0; - tile->next_tile2 = 0; tile->anim_speed = 25; LispReader reader(lisp_cdr(element)); @@ -62,7 +61,6 @@ void TileManager::load_tileset(std::string filename) reader.read_int("alpha", (int*)&tile->alpha); reader.read_int("anim-speed", &tile->anim_speed); reader.read_int("next-tile", &tile->next_tile); - reader.read_int("next-tile2", &tile->next_tile2); reader.read_string_vector("images", &tile->filenames); for(std::vector::iterator it = tile->filenames.begin(); diff --git a/src/tile.h b/src/tile.h index 7ec80356c..fc1520817 100644 --- a/src/tile.h +++ b/src/tile.h @@ -49,7 +49,6 @@ struct Tile /** Id of the tile that is going to replace this tile once it has been collected or jumped at */ int next_tile; - int next_tile2; int anim_speed; unsigned char alpha;