From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 20 Oct 2011 07:36:36 +0000 (+0200)
Subject: undo part of the "new use key system". The impulse still works and may be more conven... 
X-Git-Tag: xonotic-v0.6.0~40^2~24
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=9f7e5d20f52739c93eef02f163dea56392b4a83e

undo part of the "new use key system". The impulse still works and may be more convenient for scripts, but button alone is ok.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f92882f44..cc40ede24 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -53,8 +53,6 @@ alias asay_drop "say_team (%l) dropped %w ; impulse 17"
 alias +hook +button6
 alias -hook -button6
 alias use "impulse 21"
-alias +use use // always send that impulse AND press the key (+use is engine internal command and executes anyway)
-set cl_newusekeysupported 1 // indicates that we always send the use impulse too, so they do not need to be synthesized
 alias ready "cmd ready"
 alias lockteams "sv_cmd lockteams"
 alias unlockteams "sv_cmd unlockteams"
diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index f41503ab0..299df0d08 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2777,7 +2777,7 @@ void PlayerPreThink (void)
 
 	MUTATOR_CALLHOOK(PlayerPreThink);
 
-	if(!self.cvar_cl_newusekeysupported)
+	if(!self.cvar_cl_newusekeysupported) // FIXME remove this - it was a stupid idea to begin with, we can JUST use the button
 	{
 		if(self.BUTTON_USE && !self.usekeypressed)
 			PlayerUseKey();