X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_grenadelauncher.qc;h=75d3d7e7bb8925c55d36ce8f114e26e25cda6dba;hb=50fae2ffe748fce0c54b20ef168a702f9607b8db;hp=0bc08b8de77f2b2a6d84c9603d571bac6188421e;hpb=e16769afc48942cb2e9323f0e86b090959bf36b7;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc index 0bc08b8de..75d3d7e7b 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); @@ -200,6 +200,8 @@ void W_Grenade_Attack (void) 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)