about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-03 23:15:54 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-03 23:15:54 +0000
commit6adaa946771cc21388ef24ebbe1cf8f62b1e31e5 (patch)
tree3b9174e96d46def3a94069000ac6f98afc24b266 /src/game
parent0c9b4deadca21bdb957dab345a23de420810ad9b (diff)
downloadzcatch-6adaa946771cc21388ef24ebbe1cf8f62b1e31e5.tar.gz
zcatch-6adaa946771cc21388ef24ebbe1cf8f62b1e31e5.zip
removed menu music
Diffstat (limited to 'src/game')
-rw-r--r--src/game/client/game_client.cpp13
1 files changed, 0 insertions, 13 deletions
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();
 	}