Merge branch 'master' into Mario/stats_eloranking

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / util.qc

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 676ae4c4b3e6d0365f7a44e322d80cd5eebfbbdc..7713679f3ce57a2cbaa1deb6cd9f663a3245e6d0 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -522,7 +522,7 @@ string fixPriorityList(string order, float from, float to, float subtract, float
                for(w = to; w >= from; --w)
                {
                        int wflags = Weapons_from(w).spawnflags;
-                       if((wflags & WEP_FLAG_HIDDEN) && (wflags & WEP_FLAG_MUTATORBLOCKED) && !(wflags & WEP_FLAG_NORMAL))
+                       if(wflags & WEP_FLAG_SPECIALATTACK)
                                continue;
                        for(i = 0; i < n; ++i)
                                if(stof(argv(i)) == w)
@@ -1399,7 +1399,12 @@ float get_model_parameters(string m, float sk)
                                case "reserved":    get_model_parameters_species = SPECIES_RESERVED;    break;
                        }
                if(c == "sex")
+               {
+                       if (s == "Male")                                s = _("Male");
+                       else if (s == "Female")                 s = _("Female");
+                       else if (s == "Undisclosed")    s = _("Undisclosed");
                        get_model_parameters_sex = s;
+               }
                if(c == "weight")
                        get_model_parameters_weight = stof(s);
                if(c == "age")
@@ -1442,6 +1447,12 @@ string translate_key(string key)
 {
        if (prvm_language == "en") return key;
 
+       if (substring(key, 0, 1) == "<")
+       {
+               if (key == "<KEY NOT FOUND>") return _("<KEY NOT FOUND>");
+               if (key == "<UNKNOWN KEYNUM>") return _("<UNKNOWN KEYNUM>");
+       }
+
        switch(key)
        {
                case "TAB":                             return _("TAB");
@@ -1459,19 +1470,6 @@ string translate_key(string key)
                case "CTRL":                    return _("CTRL");
                case "SHIFT":                   return _("SHIFT");
 
-               case "F1":                              return _("F1");
-               case "F2":                              return _("F2");
-               case "F3":                              return _("F3");
-               case "F4":                              return _("F4");
-               case "F5":                              return _("F5");
-               case "F6":                              return _("F6");
-               case "F7":                              return _("F7");
-               case "F8":                              return _("F8");
-               case "F9":                              return _("F9");
-               case "F10":                             return _("F10");
-               case "F11":                             return _("F11");
-               case "F12":                             return _("F12");
-
                case "INS":                             return _("INS");
                case "DEL":                             return _("DEL");
                case "PGDN":                    return _("PGDN");
@@ -1493,6 +1491,16 @@ string translate_key(string key)
                case "BACKSLASH":               return _("BACKSLASH");
        }
 
+       if (substring(key, 0, 1) == "F")
+       {
+               string subkey = substring(key, 1, -1);
+               if (IS_DIGIT(substring(key, 3, 1))) // check only first digit
+               {
+                       return sprintf(_("F%d"), stof(subkey));
+               }
+               // continue in case there is another key name starting with F
+       }
+
        if (substring(key, 0, 3) == "KP_")
        {
                string subkey = substring(key, 3, -1);