Merge branch 'master' into terencehill/directmenu_options

diff --combined qcsrc/menu/command/menu_cmd.qc
index aa68f2c1bc591dd7fab34aaf76c2ea44798f199a,f6312931f6a11c4117c159433c2361c949ec22c0..dbf9e14bd47088288147d1ad73bd5a6f5cf8d017
--- 1/qcsrc/menu/command/menu_cmd.qc
--- 2/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@@ -25,35 -25,6 +25,6 @@@ void _dumptree_close(entity pass, entit
        }
  }
  
- float curl_uri_get_pos;
- float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
- string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
- void Curl_URI_Get_Callback(float id, float status, string data)
- {
-       float i;
-       float do_exec;
-       string do_cvar;
-       i = id - URI_GET_CURL;
-       do_exec = curl_uri_get_exec[i];
-       do_cvar = curl_uri_get_cvar[i];
-       if(status != 0)
-       {
-               print(sprintf(_("error: status is %d\n"), status));
-               if(do_cvar)
-                       strunzone(do_cvar);
-               return;
-       }
-       if(do_exec)
-               localcmd(data);
-       if(do_cvar)
-       {
-               cvar_set(do_cvar, data);
-               strunzone(do_cvar);
-       }
-       if(!do_exec && !do_cvar)
-               print(data);
- }
- 
  void GameCommand(string theCommand)
  {
        float argc;
@@@ -77,55 -48,36 +48,55 @@@
                return;
        }
  
 -      if(argv(0) == "directmenu") if(argc == 2)
 +      if(argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
        {
 -              // switch to a menu item
 -              if(!isdemo()) // don't allow this command in demos
 -                      m_goto(argv(1));
 -              return;
 -      }
 +              string filter;
 +              if(argv(0) == "directpanelhudmenu")
 +                      filter = strzone("HUD");
  
 -      if(argv(0) == "directpanelhudmenu")
 -      {
 -              // switch to a menu item
 -              m_goto(strcat("HUD", argv(1)));
 +              if(argc == 1)
 +              {
 +                      print(_("Available options:\n"));
 +                      float i;
 +                      entity e;
 +                      string s;
 +
 +                      for(i = 0, e = world; (e = nextent(e)); )
 +                              if(e.classname != "vtbl" && e.name != "")
 +                              {
 +                                      s = e.name;
 +                                      if(filter)
 +                                      {
 +                                              if(substring(s, 0, strlen(filter)) != filter)
 +                                                      continue;
 +                                              s = substring(s, strlen(filter), strlen(s) - strlen(filter));
 +                                      }
 +                                      print(strcat(" ", s ,"\n"));
 +                                      ++i;
 +                              }
 +              }
 +              else if(argc == 2 && !isdemo()) // don't allow this command in demos
 +                      m_goto(strcat(filter, argv(1))); // switch to a menu item
 +              if(filter)
 +                      strunzone(filter);
                return;
        }
  
        if(argv(0) == "skinselect")
        {
-               m_goto_skin_selector();
+               m_goto("skinselector");
                return;
        }
  
        if(argv(0) == "languageselect")
        {
-               m_goto_language_selector();
+               m_goto("languageselector");
                return;
        }
  
        if(argv(0) == "videosettings")
        {
-               m_goto_video_settings();
+               m_goto("videosettings");
                return;
        }
  
@@@ -138,68 -90,6 +109,6 @@@
  
        if(argv(0) == "curl")
        {
-               float do_exec;
-               string do_cvar;
-               float key;
-               float i, j;
-               string url;
-               float buf;
-               float r;
- 
-               do_exec = FALSE;
-               do_cvar = string_null;
-               key = -1;
- 
-               for(i = 1; i+1 < argc; ++i)
-               {
-                       if(argv(i) == "--cvar" && i+2 < argc)
-                       {
-                               ++i;
-                               do_cvar = strzone(argv(i));
-                               continue;
-                       }
-                       if(argv(i) == "--exec")
-                       {
-                               do_exec = TRUE;
-                               continue;
-                       }
-                       if(argv(i) == "--key" && i+2 < argc)
-                       {
-                               ++i;
-                               key = stof(argv(i));
-                               continue;
-                       }
-                       break;
-               }
- 
-               // now, argv(i) is the URL
-               // following args may be POST parameters
-               url = argv(i);
-               ++i;
-               buf = buf_create();
-               j = 0;
-               for(; i+1 < argc; i += 2)
-                       bufstr_set(buf, ++j, sprintf("%s=%s", uri_escape(argv(i)), uri_escape(argv(i+1))));
-               if(i < argc)
-                       bufstr_set(buf, ++j, sprintf("submit=%s", uri_escape(argv(i))));
- 
-               if(j == 0) // no args: GET
-                       r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
-               else // with args: POST
-                       r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
- 
-               if(r)
-               {
-                       curl_uri_get_exec[curl_uri_get_pos] = do_exec;
-                       curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
-                       curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
-               }
-               else
-                       print(_("error creating curl handle\n"));
- 
-               buf_del(buf);
- 
-               return;
        }
  
        print(_("Invalid command. For a list of supported commands, try menu_cmd help.\n"));