X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=a22d164ef073f9ccf5c55f5b9e4743cd2653c061;hp=1767b8f2bd76c48d95deb6e4a67c885dcbd4faa3;hb=bb546c1946b7b925f24b1473ad89789746acc4c2;hpb=daab9330abb8952053b47239d1322cd029b08cd1

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 1767b8f2b..a22d164ef 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -290,9 +290,8 @@ float SetTeam(entity o, int Team)
 	return false;
 }
 
-void Playerchecker_Think()
+void Playerchecker_Think(entity this)
 {
-	SELFPARAM();
     int i;
 	entity e;
 	for(i = 0; i < maxclients; ++i)
@@ -524,6 +523,7 @@ NET_HANDLE(ENT_CLIENT_CLIENTDATA, bool isnew)
 		// clear race stuff
 		race_laptime = 0;
 		race_checkpointtime = 0;
+		hud_dynamic_shake_factor = -1;
 	}
 	if (autocvar_hud_panel_healtharmor_progressbar_gfx)
 	{
@@ -782,7 +782,7 @@ NET_HANDLE(ENT_CLIENT_SPAWNEVENT, bool is_new)
 // The only parameter reflects if the entity is "new" to the client, meaning it just came into the client's PVS.
 void CSQC_Ent_Update(bool isnew)
 {
-	SELFPARAM();
+	SELFPARAM(); // needed for engine functions
 	this.sourceLoc = __FILE__ ":" STR(__LINE__);
 	int t = ReadByte();
 
@@ -863,7 +863,7 @@ void Ent_Remove(entity this)
 // CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed.  Essentially call remove(this) as well.
 void CSQC_Ent_Remove()
 {
-	SELFPARAM();
+	SELFPARAM(); // needed for engine functions
 	if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Ent_Remove() with this=%i {.entnum=%d, .enttype=%d}\n", this, this.entnum, this.enttype);
 	if (wasfreed(this))
 	{
@@ -1188,16 +1188,21 @@ string getcommandkey(string text, string command)
 	keys = db_get(binddb, command);
 	if (keys == "")
 	{
+		bool joy_detected = cvar("joy_detected");
 		n = tokenize(findkeysforcommand(command, 0)); // uses '...' strings
 		for(j = 0; j < n; ++j)
 		{
 			k = stof(argv(j));
 			if(k != -1)
 			{
-				if ("" == keys)
-					keys = keynumtostring(k);
+				string key = keynumtostring(k);
+				if(!joy_detected && substring(key, 0, 3) == "JOY")
+					continue;
+
+				if (keys == "")
+					keys = key;
 				else
-					keys = strcat(keys, ", ", keynumtostring(k));
+					keys = strcat(keys, ", ", key);
 
 				++l;
 				if (autocvar_hud_showbinds_limit > 0 && autocvar_hud_showbinds_limit <= l)