X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_grenadelauncher.qc;h=75d3d7e7bb8925c55d36ce8f114e26e25cda6dba;hb=50fae2ffe748fce0c54b20ef168a702f9607b8db;hp=6634f0f546a14a2f3b5789d5bbd5e1c62f5e3e45;hpb=aaf697e6f12d23c7d7d75f352f7703f2c8491485;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 6634f0f546..75d3d7e7bb 100644
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -174,8 +174,8 @@ void W_Grenade_Attack (void)
 	gren.bot_dodge = TRUE;
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
-	gren.bouncefactor = cvar("g_balance_grenadelauncher_primary_bouncefactor");
-	gren.bouncestop = cvar("g_balance_grenadelauncher_primary_bouncestop");
+	gren.bouncefactor = cvar("g_balance_grenadelauncher_bouncefactor");
+	gren.bouncestop = cvar("g_balance_grenadelauncher_bouncestop");
 	PROJECTILE_MAKETRIGGER(gren);
 	gren.projectiledeathtype = WEP_GRENADE_LAUNCHER;
 	setorigin(gren, w_shotorg);
@@ -196,10 +196,12 @@ void W_Grenade_Attack (void)
 	gren.angles = vectoangles (gren.velocity);
 	gren.flags = FL_PROJECTILE;
 
-	if(cvar("g_balance_grenadelauncher_secondary_type") == 0 || cvar("g_balance_grenadelauncher_secondary_type") == 2)
+	if(cvar("g_balance_grenadelauncher_primary_type") == 0 || cvar("g_balance_grenadelauncher_primary_type") == 2)
 		CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
 	else
 		CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
+
+	other = gren; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void W_Grenade_Attack2 (void)
@@ -219,8 +221,8 @@ void W_Grenade_Attack2 (void)
 	gren.bot_dodge = TRUE;
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_secondary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
-	gren.bouncefactor = cvar("g_balance_grenadelauncher_secondary_bouncefactor");
-	gren.bouncestop = cvar("g_balance_grenadelauncher_secondary_bouncestop");
+	gren.bouncefactor = cvar("g_balance_grenadelauncher_bouncefactor");
+	gren.bouncestop = cvar("g_balance_grenadelauncher_bouncestop");
 	PROJECTILE_MAKETRIGGER(gren);
 	gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY;
 	setorigin(gren, w_shotorg);
@@ -244,6 +246,8 @@ void W_Grenade_Attack2 (void)
 		CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE, TRUE);
 	else
 		CSQCProjectile(gren, TRUE, PROJECTILE_GRENADE_BOUNCING, TRUE);
+
+	other = gren; MUTATOR_CALLHOOK(EditProjectile);
 }
 
 void spawnfunc_weapon_grenadelauncher (void)