Merge branch 'master' into martin-t/AMMO

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

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index af7bc76cace610ce982cb3a30896d0bfee015370..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");