Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

diff --git a/input-tuba.cfg b/input-tuba.cfg
index 6d8bd90e395ccd39a810e80681bb8e81fb5174de..b83af0752b254b09140a61142f3432e00795cef6 100644 (file)
--- a/input-tuba.cfg
+++ b/input-tuba.cfg
@@ -28,10 +28,10 @@ alias +tuba_c "+crouch; +tuba_$*"
 alias -tuba_c "-crouch; -tuba_$*"
 alias +tuba_j "+jump; +tuba_$*"
 alias -tuba_j "-jump; -tuba_$*"
-alias +tuba_1 "+attack"
-alias -tuba_1 "-attack"
-alias +tuba_2 "+attack2"
-alias -tuba_2 "-attack2"
+alias +tuba_1 "+fire"
+alias -tuba_1 "-fire"
+alias +tuba_2 "+fire2"
+alias -tuba_2 "-fire2"
 alias +tuba_! "echo cannot play this note, sorry"
 alias -tuba_! ""
 alias +tuba_ ""

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f08ef5f5385b7b9dad3eb90bd06a86efbbff21db..9b53a1d955fed3949edbc2c1392bebf4aaf74485 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2856,9 +2856,16 @@ float isInvisibleString(string s)
                switch(c)
                {
                        case 0:
-                       case 32:
-                       case 160:
+                       case 32: // space
                                break;
+                       case 192: // charmap space
+                               if (!cvar("utf8_enable"))
+                                       break;
+                               return FALSE;
+                       case 160: // space in unicode fonts
+                       case 0xE000 + 192: // utf8 charmap space
+                               if (cvar("utf8_enable"))
+                                       break;
                        default:
                                return FALSE;
                }