Merge remote branch 'refs/remotes/origin/diabolik/weaponscale'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / clientcommands.qc

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index d4c1eaa6ceb7681ad413dd77984a81422f4df0f9..ff5794dae989397d202294c1641844ee7b678e57 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -158,7 +158,7 @@ void SV_ParseClientCommand(string s) {
                if not(self.flags & FL_CLIENT)
                        return;
                if (argv(1) == "$gameversion") {
-                       //versionmsg = "^1client is too old to get versioninfo.\nUPDATE!!! (http://www.nexuiz.com)^8";
+                       //versionmsg = "^1client is too old to get versioninfo.\nUPDATE!!! (http://www.xonotic.com)^8";
                        // either that or someone wants to be funny
                        self.version = 1;
                } else {
@@ -225,7 +225,6 @@ void SV_ParseClientCommand(string s) {
                                DropFlag(self.flagcarried, world, world);
                        if(self.ballcarried)
                                DropBall(self.ballcarried, self.origin, self.velocity);
-                       kh_Key_DropAll(self, TRUE);
                        WaypointSprite_PlayerDead();
                        self.classname = "observer";
                        if(g_ca)