From 6adaa946771cc21388ef24ebbe1cf8f62b1e31e5 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 3 Dec 2007 23:15:54 +0000 Subject: removed menu music --- data/audio/music_menu.wv | Bin 678784 -> 0 bytes src/game/client/game_client.cpp | 13 ------------- 2 files changed, 13 deletions(-) delete mode 100644 data/audio/music_menu.wv diff --git a/data/audio/music_menu.wv b/data/audio/music_menu.wv deleted file mode 100644 index b396c581..00000000 Binary files a/data/audio/music_menu.wv and /dev/null differ diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index 3325de65..34c75dd0 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -31,9 +31,6 @@ data_container *data = 0x0; int gametype = GAMETYPE_DM; -static int music_menu = -1; -static int music_menu_id = -1; - extern void modmenu_render(); enum @@ -557,7 +554,6 @@ extern "C" void modc_init() data = load_data_from_memory(internal_data); // TODO: should be removed - music_menu = snd_load_wv("data/audio/music_menu.wv"); snd_set_listener_pos(0.0f, 0.0f); float total = data->num_sounds+data->num_images; @@ -2650,12 +2646,6 @@ extern "C" void modc_render() // this should be moved around abit if(client_state() == CLIENTSTATE_ONLINE) { - if (music_menu_id != -1) - { - snd_stop(music_menu_id); - music_menu_id = -1; - } - render_game(); // handle team switching @@ -2670,9 +2660,6 @@ extern "C" void modc_render() } else // if (client_state() != CLIENTSTATE_CONNECTING && client_state() != CLIENTSTATE_LOADING) { - if (music_menu_id == -1) - music_menu_id = snd_play(CHN_MUSIC, music_menu, SNDFLAG_LOOP); - modmenu_render(); } -- cgit 1.4.1