X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Frocketflying%2Fsv_rocketflying.qc;fp=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Frocketflying%2Fsv_rocketflying.qc;h=58e20568eddf02d9d1ddd90616af3890d2e9ceb8;hb=be37ea91fb3bbd1a6fa4f0b70b32d1ea95343ad4;hp=9f0d8fbf0d5ec4907204169f4a7e53d17e338dbb;hpb=c1afbb3db4d2b8f1ca73b331ebe00cd276a99f1b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc b/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
index 9f0d8fbf0d..58e20568ed 100644
--- a/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
+++ b/qcsrc/common/mutators/mutator/rocketflying/sv_rocketflying.qc
@@ -1,18 +1,25 @@
 #include "sv_rocketflying.qh"
 
-REGISTER_MUTATOR(rocketflying, cvar("g_rocket_flying"));
+string autocvar_g_rocket_flying;
+bool autocvar_g_rocket_flying_disabledelays = true;
+REGISTER_MUTATOR(rocketflying, expr_evaluate(autocvar_g_rocket_flying));
 
 MUTATOR_HOOKFUNCTION(rocketflying, EditProjectile)
 {
 	entity proj = M_ARGV(1, entity);
 
-	if(proj.classname == "rocket" || proj.classname == "mine")
+	if(autocvar_g_rocket_flying_disabledelays && (proj.classname == "rocket" || proj.classname == "mine"))
 	{
 		// kill detonate delay of rockets
 		proj.spawnshieldtime = time;
 	}
 }
 
+MUTATOR_HOOKFUNCTION(rocketflying, AllowRocketJumping)
+{
+	M_ARGV(0, bool) = true; // force rocket jumping
+}
+
 MUTATOR_HOOKFUNCTION(rocketflying, BuildMutatorsString)
 {
 	M_ARGV(0, string) = strcat(M_ARGV(0, string), ":RocketFlying");