X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fmultijump%2Fmultijump.qc;h=0efd85635cc88503b9998675c59eaf2369fd347c;hb=139a594d29f65508e5d6001e90d4ee4fad82ca66;hp=ecedc475961585184fd61bad6785d2986f00f23e;hpb=268f9c69576b6bb929f66d19f0d077d19ba47edd;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 ecedc4759..0efd85635 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
@@ -24,13 +24,14 @@ REGISTER_MUTATOR(multijump, true);
 .bool multijump_ready;
 
 #ifdef CSQC
+bool cvar_cl_multijump;
 bool autocvar_cl_multijump = true;
 
 	#define PHYS_MULTIJUMP_CLIENT(s)	autocvar_cl_multijump
 #elif defined(SVQC)
 .bool cvar_cl_multijump;
 
-	#define PHYS_MULTIJUMP_CLIENT(s)	(s).cvar_cl_multijump
+	#define PHYS_MULTIJUMP_CLIENT(s)	CS(s).cvar_cl_multijump
 #endif
 
 MUTATOR_HOOKFUNCTION(multijump, PlayerPhysics)
@@ -82,7 +83,7 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump)
 			if(M_ARGV(2, bool))
 			{
 				if(PHYS_MULTIJUMP_DODGING(player))
-				if(player.movement_x != 0 || player.movement_y != 0) // don't remove all speed if player isnt pressing any movement keys
+				if(PHYS_CS(player).movement_x != 0 || PHYS_CS(player).movement_y != 0) // don't remove all speed if player isnt pressing any movement keys
 				{
 					float curspeed;
 					vector wishvel, wishdir;
@@ -97,7 +98,7 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump)
 //#endif
 
 					makevectors(player.v_angle_y * '0 1 0');
-					wishvel = v_forward * player.movement_x + v_right * player.movement_y;
+					wishvel = v_forward * PHYS_CS(player).movement_x + v_right * PHYS_CS(player).movement_y;
 					wishdir = normalize(wishvel);
 
 					player.velocity_x = wishdir_x * curspeed; // allow "dodging" at a multijump
@@ -114,10 +115,10 @@ MUTATOR_HOOKFUNCTION(multijump, PlayerJump)
 	}
 }
 
-#ifdef SVQC
-
 REPLICATE(cvar_cl_multijump, bool, "cl_multijump");
 
+#ifdef SVQC
+
 MUTATOR_HOOKFUNCTION(multijump, BuildMutatorsString)
 {
 	M_ARGV(0, string) = strcat(M_ARGV(0, string), ":multijump");