X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fmultijump%2Fmultijump.qc;h=9642ab0b38c6bc82ba8495fa87f1df8a2bca0a33;hb=4435e6a342e65c52cb1fc00aea84f6018eff16ac;hp=47dcfd4afd550230ab85fbff4872d03cdc6e13bd;hpb=7e474d576080259e21690de30778b17029b5c0f2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc
index 47dcfd4af..9642ab0b3 100644
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qc
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc
@@ -9,7 +9,7 @@
 
 
 #if defined(SVQC)
-REGISTER_MUTATOR(multijump, cvar("g_multijump"));
+REGISTER_MUTATOR(multijump, autocvar_g_multijump);
 #elif defined(CSQC)
 REGISTER_MUTATOR(multijump, true);
 #endif
@@ -20,17 +20,19 @@ REGISTER_MUTATOR(multijump, true);
 #define PHYS_MULTIJUMP_MAXSPEED(s) 		STAT(MULTIJUMP_MAXSPEED, s)
 #define PHYS_MULTIJUMP_DODGING(s) 		STAT(MULTIJUMP_DODGING, s)
 #define PHYS_MULTIJUMP_COUNT(s) 		STAT(MULTIJUMP_COUNT, s)
+#define PHYS_MULTIJUMP_CLIENTDEFAULT(s)	STAT(MULTIJUMP_CLIENT, s)
 
 .bool multijump_ready;
 
 #ifdef CSQC
-bool autocvar_cl_multijump = true;
+int cvar_cl_multijump;
+int autocvar_cl_multijump = -1;
 
 	#define PHYS_MULTIJUMP_CLIENT(s)	autocvar_cl_multijump
 #elif defined(SVQC)
-.bool cvar_cl_multijump;
+.int cvar_cl_multijump;
 
-	#define PHYS_MULTIJUMP_CLIENT(s)	CS(s).cvar_cl_multijump
+	#define PHYS_MULTIJUMP_CLIENT(s)	CS_CVAR(s).cvar_cl_multijump
 #endif
 
 MUTATOR_HOOKFUNCTION(multijump, PlayerPhysics)
@@ -53,6 +55,8 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump)
 	if(!PHYS_MULTIJUMP(player)) { return; }
 
 	int client_multijump = PHYS_MULTIJUMP_CLIENT(player);
+	if(client_multijump == -1)
+		client_multijump = PHYS_MULTIJUMP_CLIENTDEFAULT(player);
 	if(client_multijump > 1)
 		return; // nope
 
@@ -114,9 +118,9 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump)
 	}
 }
 
-#ifdef SVQC
+REPLICATE(cvar_cl_multijump, int, "cl_multijump");
 
-REPLICATE(cvar_cl_multijump, bool, "cl_multijump");
+#ifdef SVQC
 
 MUTATOR_HOOKFUNCTION(multijump, BuildMutatorsString)
 {