S_LoadSound now automatically tries both with and without sound/ when loading sounds...

[xonotic/darkplaces.git] / menu.c

diff --git a/menu.c b/menu.c
index 7cc80ea866bc4a68be1cdabb1902cd70fd4bdbe4..2f0bde724a1427858343edafda1bd684a94dd5bf 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -330,7 +330,7 @@ void M_Demo_Key (int k, char ascii)
                break;
 
        case K_ENTER:
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                m_state = m_none;
                key_dest = key_game;
                Cbuf_AddText (va ("playdemo %s\n", NehahraDemos[demo_cursor].name));
@@ -338,7 +338,7 @@ void M_Demo_Key (int k, char ascii)
 
        case K_UPARROW:
        case K_LEFTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                demo_cursor--;
                if (demo_cursor < 0)
                        demo_cursor = NumberOfNehahraDemos-1;
@@ -346,7 +346,7 @@ void M_Demo_Key (int k, char ascii)
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                demo_cursor++;
                if (demo_cursor >= NumberOfNehahraDemos)
                        demo_cursor = 0;
@@ -432,13 +432,13 @@ void M_Main_Key (int key, char ascii)
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (++m_main_cursor >= MAIN_ITEMS)
                        m_main_cursor = 0;
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (--m_main_cursor < 0)
                        m_main_cursor = MAIN_ITEMS - 1;
                break;
@@ -657,13 +657,13 @@ void M_SinglePlayer_Key (int key, char ascii)
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (++m_singleplayer_cursor >= SINGLEPLAYER_ITEMS)
                        m_singleplayer_cursor = 0;
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (--m_singleplayer_cursor < 0)
                        m_singleplayer_cursor = SINGLEPLAYER_ITEMS - 1;
                break;
@@ -807,7 +807,7 @@ void M_Load_Key (int k, char ascii)
                break;
 
        case K_ENTER:
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                if (!loadable[load_cursor])
                        return;
                m_state = m_none;
@@ -819,7 +819,7 @@ void M_Load_Key (int k, char ascii)
 
        case K_UPARROW:
        case K_LEFTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                load_cursor--;
                if (load_cursor < 0)
                        load_cursor = MAX_SAVEGAMES-1;
@@ -827,7 +827,7 @@ void M_Load_Key (int k, char ascii)
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                load_cursor++;
                if (load_cursor >= MAX_SAVEGAMES)
                        load_cursor = 0;
@@ -852,7 +852,7 @@ void M_Save_Key (int k, char ascii)
 
        case K_UPARROW:
        case K_LEFTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                load_cursor--;
                if (load_cursor < 0)
                        load_cursor = MAX_SAVEGAMES-1;
@@ -860,7 +860,7 @@ void M_Save_Key (int k, char ascii)
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                load_cursor++;
                if (load_cursor >= MAX_SAVEGAMES)
                        load_cursor = 0;
@@ -910,13 +910,13 @@ void M_MultiPlayer_Key (int key, char ascii)
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (++m_multiplayer_cursor >= MULTIPLAYER_ITEMS)
                        m_multiplayer_cursor = 0;
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (--m_multiplayer_cursor < 0)
                        m_multiplayer_cursor = MULTIPLAYER_ITEMS - 1;
                break;
@@ -1081,14 +1081,14 @@ void M_Setup_Key (int k, char ascii)
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                setup_cursor--;
                if (setup_cursor < 0)
                        setup_cursor = NUM_SETUP_CMDS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                setup_cursor++;
                if (setup_cursor >= NUM_SETUP_CMDS)
                        setup_cursor = 0;
@@ -1097,7 +1097,7 @@ void M_Setup_Key (int k, char ascii)
        case K_LEFTARROW:
                if (setup_cursor < 1)
                        return;
-               S_LocalSound ("misc/menu3.wav", true);
+               S_LocalSound ("sound/misc/menu3.wav");
                if (setup_cursor == 1)
                        setup_top = setup_top - 1;
                if (setup_cursor == 2)
@@ -1114,7 +1114,7 @@ void M_Setup_Key (int k, char ascii)
                if (setup_cursor < 1)
                        return;
 forward:
-               S_LocalSound ("misc/menu3.wav", true);
+               S_LocalSound ("sound/misc/menu3.wav");
                if (setup_cursor == 1)
                        setup_top = setup_top + 1;
                if (setup_cursor == 2)
@@ -1230,7 +1230,7 @@ extern cvar_t r_textshadow;
 void M_Menu_Options_AdjustSliders (int dir)
 {
        int optnum;
-       S_LocalSound ("misc/menu3.wav", true);
+       S_LocalSound ("sound/misc/menu3.wav");
 
        optnum = 7;
        if (options_cursor == optnum++)
@@ -1452,14 +1452,14 @@ void M_Options_Key (int k, char ascii)
                return;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_cursor--;
                if (options_cursor < 0)
                        options_cursor = OPTIONS_ITEMS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_cursor++;
                if (options_cursor >= OPTIONS_ITEMS)
                        options_cursor = 0;
@@ -1519,7 +1519,7 @@ extern cvar_t r_lightningbeam_qmbtexture;
 void M_Menu_Options_Effects_AdjustSliders (int dir)
 {
        int optnum;
-       S_LocalSound ("misc/menu3.wav", true);
+       S_LocalSound ("sound/misc/menu3.wav");
 
        optnum = 0;
             if (options_effects_cursor == optnum++) Cvar_SetValueQuick (&r_modellights, bound(0, r_modellights.value + dir, 8));
@@ -1630,14 +1630,14 @@ void M_Options_Effects_Key (int k, char ascii)
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_effects_cursor--;
                if (options_effects_cursor < 0)
                        options_effects_cursor = OPTIONS_EFFECTS_ITEMS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_effects_cursor++;
                if (options_effects_cursor >= OPTIONS_EFFECTS_ITEMS)
                        options_effects_cursor = 0;
@@ -1676,7 +1676,7 @@ extern cvar_t r_shadow_realtime_world_shadows;
 void M_Menu_Options_Graphics_AdjustSliders (int dir)
 {
        int optnum;
-       S_LocalSound ("misc/menu3.wav", true);
+       S_LocalSound ("sound/misc/menu3.wav");
  
        optnum = 0;
 
@@ -1729,14 +1729,14 @@ void M_Options_Graphics_Key (int k, char ascii)
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_graphics_cursor--;
                if (options_graphics_cursor < 0)
                        options_graphics_cursor = OPTIONS_GRAPHICS_ITEMS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_graphics_cursor++;
                if (options_graphics_cursor >= OPTIONS_GRAPHICS_ITEMS)
                        options_graphics_cursor = 0;
@@ -1772,7 +1772,7 @@ void M_Menu_Options_ColorControl_AdjustSliders (int dir)
 {
        int optnum;
        float f;
-       S_LocalSound ("misc/menu3.wav", true);
+       S_LocalSound ("sound/misc/menu3.wav");
 
        optnum = 1;
        if (options_colorcontrol_cursor == optnum++)
@@ -1976,14 +1976,14 @@ void M_Options_ColorControl_Key (int k, char ascii)
                return;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_colorcontrol_cursor--;
                if (options_colorcontrol_cursor < 0)
                        options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                options_colorcontrol_cursor++;
                if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
                        options_colorcontrol_cursor = 0;
@@ -2322,7 +2322,7 @@ void M_Keys_Key (int k, char ascii)
 
        if (bind_grab)
        {       // defining a key
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                if (k == K_ESCAPE)
                {
                        bind_grab = false;
@@ -2345,7 +2345,7 @@ void M_Keys_Key (int k, char ascii)
 
        case K_LEFTARROW:
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                do
                {
                        keys_cursor--;
@@ -2357,7 +2357,7 @@ void M_Keys_Key (int k, char ascii)
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                do
                {
                        keys_cursor++;
@@ -2369,7 +2369,7 @@ void M_Keys_Key (int k, char ascii)
 
        case K_ENTER:           // go into bind mode
                M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                if (keys[NUMKEYS - 1] != -1)
                        M_UnbindCommand (bindnames[keys_cursor][0]);
                bind_grab = true;
@@ -2377,7 +2377,7 @@ void M_Keys_Key (int k, char ascii)
 
        case K_BACKSPACE:               // delete bindings
        case K_DEL:                             // delete bindings
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                M_UnbindCommand (bindnames[keys_cursor][0]);
                break;
        }
@@ -2505,7 +2505,7 @@ void M_Video_Draw (void)
 
 void M_Menu_Video_AdjustSliders (int dir)
 {
-       S_LocalSound ("misc/menu3.wav", true);
+       S_LocalSound ("sound/misc/menu3.wav");
 
        switch (video_cursor)
        {
@@ -2551,7 +2551,7 @@ void M_Video_Key (int key, char ascii)
                        Cvar_SetValueQuick(&vid_height, current_vid_height);
                        Cvar_SetValueQuick(&vid_bitsperpixel, current_vid_bitsperpixel);
 
-                       S_LocalSound ("misc/menu1.wav", true);
+                       S_LocalSound ("sound/misc/menu1.wav");
                        M_Menu_Options_f ();
                        break;
 
@@ -2569,14 +2569,14 @@ void M_Video_Key (int key, char ascii)
                        break;
 
                case K_UPARROW:
-                       S_LocalSound ("misc/menu1.wav", true);
+                       S_LocalSound ("sound/misc/menu1.wav");
                        video_cursor--;
                        if (video_cursor < 0)
                                video_cursor = VIDEO_ITEMS-1;
                        break;
 
                case K_DOWNARROW:
-                       S_LocalSound ("misc/menu1.wav", true);
+                       S_LocalSound ("sound/misc/menu1.wav");
                        video_cursor++;
                        if (video_cursor >= VIDEO_ITEMS)
                                video_cursor = 0;
@@ -2880,14 +2880,14 @@ void M_LanConfig_Key (int key, char ascii)
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                lanConfig_cursor--;
                if (lanConfig_cursor < 0)
                        lanConfig_cursor = NUM_LANCONFIG_CMDS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                lanConfig_cursor++;
                if (lanConfig_cursor >= NUM_LANCONFIG_CMDS)
                        lanConfig_cursor = 0;
@@ -3719,14 +3719,14 @@ void M_GameOptions_Key (int key, char ascii)
                break;
 
        case K_UPARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                gameoptions_cursor--;
                if (gameoptions_cursor < 0)
                        gameoptions_cursor = NUM_GAMEOPTIONS-1;
                break;
 
        case K_DOWNARROW:
-               S_LocalSound ("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                gameoptions_cursor++;
                if (gameoptions_cursor >= NUM_GAMEOPTIONS)
                        gameoptions_cursor = 0;
@@ -3735,19 +3735,19 @@ void M_GameOptions_Key (int key, char ascii)
        case K_LEFTARROW:
                if (gameoptions_cursor == 0)
                        break;
-               S_LocalSound ("misc/menu3.wav", true);
+               S_LocalSound ("sound/misc/menu3.wav");
                M_NetStart_Change (-1);
                break;
 
        case K_RIGHTARROW:
                if (gameoptions_cursor == 0)
                        break;
-               S_LocalSound ("misc/menu3.wav", true);
+               S_LocalSound ("sound/misc/menu3.wav");
                M_NetStart_Change (1);
                break;
 
        case K_ENTER:
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                if (gameoptions_cursor == 0)
                {
                        if (sv.active)
@@ -3862,7 +3862,7 @@ void M_ServerList_Key(int k, char ascii)
 
        case K_UPARROW:
        case K_LEFTARROW:
-               S_LocalSound("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor--;
                if (slist_cursor < 0)
                        slist_cursor = hostCacheCount - 1;
@@ -3870,14 +3870,14 @@ void M_ServerList_Key(int k, char ascii)
 
        case K_DOWNARROW:
        case K_RIGHTARROW:
-               S_LocalSound("misc/menu1.wav", true);
+               S_LocalSound ("sound/misc/menu1.wav");
                slist_cursor++;
                if (slist_cursor >= hostCacheCount)
                        slist_cursor = 0;
                break;
 
        case K_ENTER:
-               S_LocalSound("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                Cbuf_AddText(va("connect \"%s\"\n", hostcache[slist_cursor].cname));
                break;
 
@@ -4069,7 +4069,7 @@ void M_Draw (void)
 
        if (m_entersound)
        {
-               S_LocalSound ("misc/menu2.wav", true);
+               S_LocalSound ("sound/misc/menu2.wav");
                m_entersound = false;
        }