X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Funit%2Fmlrs.qc;h=21e0a435d7a951619029d085a63d12fc113196a7;hp=fca6a5b718ead3e93f203cf1acacf667b3a02f33;hb=96e1acc3050bcb718e2f06702e5b88a60459a015;hpb=737346fcfbe5912ff5de24c2f22c0dbd894429a6 diff --git a/qcsrc/common/turrets/unit/mlrs.qc b/qcsrc/common/turrets/unit/mlrs.qc index fca6a5b71..21e0a435d 100644 --- a/qcsrc/common/turrets/unit/mlrs.qc +++ b/qcsrc/common/turrets/unit/mlrs.qc @@ -1,4 +1,4 @@ -#ifdef REGISTER_TURRET +#ifndef IMPLEMENTATION REGISTER_TURRET( /* TUR_##id */ MLRS, /* function */ t_mlrs, @@ -11,10 +11,10 @@ REGISTER_TURRET( ); #else #ifdef SVQC -void spawnfunc_turret_mlrs() { if(!turret_initialize(TUR_MLRS)) remove(self); } +void spawnfunc_turret_mlrs() { SELFPARAM(); if(!turret_initialize(TUR_MLRS.m_id)) remove(self); } float t_mlrs(float req) -{ +{SELFPARAM(); switch(req) { case TR_ATTACK: @@ -22,7 +22,7 @@ float t_mlrs(float req) entity missile; turret_tag_fire_update(); - missile = turret_projectile(W_Sound("rocket_fire"), 6, 10, DEATH_TURRET_MLRS, PROJECTILE_ROCKET, TRUE, TRUE); + missile = turret_projectile(SND(ROCKET_FIRE), 6, 10, DEATH_TURRET_MLRS, PROJECTILE_ROCKET, TRUE, TRUE); missile.nextthink = time + max(self.tur_impacttime,(self.shot_radius * 2) / self.shot_speed); missile.missile_flags = MIF_SPLASH; te_explosion (missile.origin); @@ -58,8 +58,6 @@ float t_mlrs(float req) } case TR_PRECACHE: { - precache_model ("models/turrets/base.md3"); - precache_model ("models/turrets/mlrs.md3"); return true; } }