undo part of the "new use key system". The impulse still works and may be more conven...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index f92882f4424da8b0ca0f2693e7be3a64e0916e95..cc40ede247f03896f9d08dee00966a39768db89d 100644 (file)
--- 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 f41503ab09c790131d48727a08a8af085aeca642..299df0d082ef84ee9d06d001f4d3b7f29fc77046 100644 (file)
--- 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();