X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=6634837db6131f9da80daf588a54b53ceae2c008;hp=4bee058f0fcff973d2d2173332b819559b8f91af;hb=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;hpb=220b53b356c5d80ab29559bd2a4e3d9e256ef4e9 diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index 4bee058f0..6634837db 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -136,6 +136,8 @@ void W_Electro_Attack() //sounds bad CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO_BEAM, TRUE); + + other = proj; MUTATOR_CALLHOOK(EditProjectile); } void W_Electro_Attack2() @@ -182,6 +184,8 @@ void W_Electro_Attack2() #endif CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound + + other = proj; MUTATOR_CALLHOOK(EditProjectile); } .vector hook_start, hook_end; @@ -238,8 +242,10 @@ void lgbeam_think() if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO) { if(cvar("g_balance_electro_primary_ammo")) - dt = min(frametime, self.owner.ammo_cells / cvar("g_balance_electro_primary_ammo")); - self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); + { + dt = min(dt, self.owner.ammo_cells / cvar("g_balance_electro_primary_ammo")); + self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); + } } W_SetupShot_Range(self.owner, TRUE, 0, "", cvar("g_balance_electro_primary_damage") * dt, cvar("g_balance_electro_primary_range"));