From bf712beb384b02d029ecabbf20bdb3e2db8cd30c Mon Sep 17 00:00:00 2001 From: Bill Kendrick Date: Sun, 28 Dec 2003 09:42:30 +0000 Subject: [PATCH] Updated songs in levels. Removed SDL_Mixer-based music speed-up attempt. SVN-Revision: 61 --- data/levels/level1.dat | 2 +- data/levels/level2.dat | 4 ++-- data/levels/level3.dat | 4 ++-- src/gameloop.c | 17 +---------------- src/sound.c | 15 +-------------- src/sound.h | 3 +-- 6 files changed, 8 insertions(+), 37 deletions(-) diff --git a/data/levels/level1.dat b/data/levels/level1.dat index 0d154f984..c52abeff5 100644 --- a/data/levels/level1.dat +++ b/data/levels/level1.dat @@ -1,7 +1,7 @@ Antarctica 1 antarctica 255 -ji_turn.it +Mortimers_chipdisko.mod 128 192 255 diff --git a/data/levels/level2.dat b/data/levels/level2.dat index 3ccb46684..10258c4c5 100644 --- a/data/levels/level2.dat +++ b/data/levels/level2.dat @@ -1,7 +1,7 @@ Antarctica 2 antarctica 230 -SALCON.MOD +Mortimers_chipdisko.mod 128 192 255 @@ -20,4 +20,4 @@ SALCON.MOD .......[===...........==]..XABY....##.............#......####......####.....#####.......................############.....[====]........#.......##......==................[=].............................$$##################............|.............. ....[==...........................#...............#........................######$..0...$...0...$..0.$##############...............................[]....................###...........................$$#####################...........|.............. ..GHIJ......GHIJ..................#...............#......[].0..0..0...[]..=#########################################..........0...............1....##....0..0..0..0..0..1###..0.0...0..1.0...0.........#######################...........|.............. -=======&&&&&&&&&&&================#...............#&&&&&==================^^^^^^^^^^^^^^^^^^^^^^^^^^^^##############============================================================================================================================^^^^^^^^ \ No newline at end of file +=======&&&&&&&&&&&================#...............#&&&&&==================^^^^^^^^^^^^^^^^^^^^^^^^^^^^##############============================================================================================================================^^^^^^^^ diff --git a/data/levels/level3.dat b/data/levels/level3.dat index d71e27931..0e3a34e80 100644 --- a/data/levels/level3.dat +++ b/data/levels/level3.dat @@ -1,7 +1,7 @@ Bug-Hunter-Course level2 1000 -SALCON.MOD +Mortimers_chipdisko.mod 100 100 100 @@ -20,4 +20,4 @@ SALCON.MOD ...#.#...................#...... .............##B....#....#...... ...========.......###....#...... -================================ \ No newline at end of file +================================ diff --git a/src/gameloop.c b/src/gameloop.c index e65180ee7..fcb589bf7 100644 --- a/src/gameloop.c +++ b/src/gameloop.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 11, 2000 - December 9, 2003 + April 11, 2000 - December 28, 2003 */ #include @@ -123,7 +123,6 @@ char song_title[20]; char levelname[20]; char leveltheme[20]; char str[10]; -int sound_pos; /* Local function prototypes: */ @@ -1127,24 +1126,10 @@ int game_action(void) if (!playing_music()) { play_music( level_song, 1 ); - sound_pos = 0; } if (tux_invincible_time > 0) tux_invincible_time--; - - if (current_music == LEVEL_MUSIC && time_left < 250) - { - if ((frame % 10) == 0) - { - set_music_position(sound_pos); - sound_pos++; - } - } - else - { - sound_pos = 0; - } } diff --git a/src/sound.c b/src/sound.c index 81ef26287..2fcc0fd96 100644 --- a/src/sound.c +++ b/src/sound.c @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 22, 2000 - December 27, 2003 + April 22, 2000 - December 28, 2003 */ /* @@ -137,19 +137,6 @@ int play_music(Mix_Music *music, int loops) } -void set_music_position(int pos) -{ - if ((use_music == YES) && (audio_device == YES)) - { - if (Mix_PlayingMusic()) - { - Mix_SetMusicPosition(pos); - } - } -} - - - void free_music(Mix_Music *music) { if ( music != NULL ) diff --git a/src/sound.h b/src/sound.h index 0de07e4c7..dd1456400 100644 --- a/src/sound.h +++ b/src/sound.h @@ -7,7 +7,7 @@ bill@newbreedsoftware.com http://www.newbreedsoftware.com/supertux/ - April 22, 2000 - December 27, 2003 + April 22, 2000 - December 28, 2003 Current maintainer: Duong-Khang NGUYEN @@ -53,7 +53,6 @@ Mix_Music * load_song(char * file); int playing_music(void); int halt_music(void); int play_music(Mix_Music*music, int loops); -void set_music_position(int pos); void free_music(Mix_Music*music); void free_chunk(Mix_Chunk*chunk); -- 2.11.0