.float trail_oldtime;
.float fade_time, fade_rate;
-void SUB_Null()
-{
-}
-
void SUB_Stop()
{
self.move_velocity = self.move_avelocity = '0 0 0';
.float gravity;
.float snd_looping;
.float silent;
-.float traileffect;
void Projectile_ResetTrail(vector to)
{
Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
if(!(self.move_flags & FL_ONGROUND))
if(self.velocity != '0 0 0')
- self.angles = vectoangles(self.velocity);
+ self.move_angles = self.angles = vectoangles(self.velocity);
}
else
{
{
case PROJECTILE_BULLET_GLOWING:
case PROJECTILE_BULLET_GLOWING_TRACER:
- R_AddDynamicLight(self.origin, 50 * a, '1 1 0');
+ adddynamiclight(self.origin, 50 * a, '1 1 0');
break;
default:
break;
return;
sound(e, ch, samp, vol, attn);
- e.snd_looping = 1;
+ e.snd_looping = ch;
}
void Ent_RemoveProjectile()
{
- if(self.snd_looping)
- sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM);
-
if(self.count & 0x80)
{
tracebox(self.origin, self.mins, self.maxs, self.origin + self.velocity * 0.05, MOVE_NORMAL, self);
self.origin_x = ReadCoord();
self.origin_y = ReadCoord();
self.origin_z = ReadCoord();
+ setorigin(self, self.origin);
if(self.count & 0x80)
{
self.velocity_x = ReadCoord();
case PROJECTILE_PORTO_RED: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break;
case PROJECTILE_PORTO_BLUE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break;
case PROJECTILE_HOOKBOMB: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_KNIGHTSPIKE"); break;
- case PROJECTILE_HAGAR: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("TR_GRENADE"); self.scale = 0.75; break;
- case PROJECTILE_HAGAR_BOUNCING: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("TR_GRENADE"); self.scale = 0.75; break;
+ case PROJECTILE_HAGAR: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("tr_hagar"); self.scale = 0.75; break;
+ case PROJECTILE_HAGAR_BOUNCING: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("tr_hagar"); self.scale = 0.75; break;
case PROJECTILE_FIREBALL: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("fireball"); break; // particle effect is good enough
case PROJECTILE_FIREMINE: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("firemine"); break; // particle effect is good enough
case PROJECTILE_TAG: setmodel(self, "models/laser.mdl"); self.traileffect = particleeffectnum("TR_ROCKET"); break;
case PROJECTILE_SPIDERROCKET: setmodel(self, "models/vehicles/rocket02.md3"); self.traileffect = particleeffectnum("spiderbot_rocket_thrust"); break;
case PROJECTILE_WAKIROCKET: setmodel(self, "models/vehicles/rocket01.md3"); self.traileffect = particleeffectnum("wakizashi_rocket_thrust"); break;
case PROJECTILE_WAKICANNON: setmodel(self, "models/laser.mdl"); self.traileffect = particleeffectnum(""); break;
+
+ case PROJECTILE_BUMBLE_GUN: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
+ case PROJECTILE_BUMBLE_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
+
default:
error("Received invalid CSQC projectile, can't work with this!");
break;
self.mins = '0 0 -4';
self.maxs = '0 0 -4';
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
self.move_bounce_factor = g_balance_electro_secondary_bouncefactor;
self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop;
break;
self.mins = '-3 -3 -3';
self.maxs = '3 3 3';
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
self.move_bounce_factor = g_balance_grenadelauncher_bouncefactor;
self.move_bounce_stopspeed = g_balance_grenadelauncher_bouncestop;
break;
self.colormod = '2 1 1';
self.alphamod = 0.5;
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
break;
case PROJECTILE_PORTO_BLUE:
self.colormod = '1 1 2';
self.alphamod = 0.5;
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
break;
case PROJECTILE_HAGAR_BOUNCING:
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
break;
case PROJECTILE_CRYLINK_BOUNCING:
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
break;
case PROJECTILE_FIREBALL:
loopsound(self, CH_SHOTS_SINGLE, "weapons/fireball_fly2.wav", VOL_BASE, ATTN_NORM);
case PROJECTILE_FIREMINE:
loopsound(self, CH_SHOTS_SINGLE, "weapons/fireball_fly.wav", VOL_BASE, ATTN_NORM);
self.move_movetype = MOVETYPE_BOUNCE;
- self.move_touch = SUB_Null;
+ self.move_touch = func_null;
self.mins = '-4 -4 -4';
self.maxs = '4 4 4';
break;
break;
case PROJECTILE_WAKIROCKET:
loopsound(self, CH_SHOTS_SINGLE, "weapons/tag_rocket_fly.wav", VOL_BASE, ATTN_NORM);
- break;
+ break;
+ /*
case PROJECTILE_WAKICANNON:
break;
+ case PROJECTILE_BUMBLE_GUN:
+ // only new engines support sound moving with object
+ loopsound(self, CH_SHOTS_SINGLE, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
+ self.mins = '0 0 -4';
+ self.maxs = '0 0 -4';
+ self.move_movetype = MOVETYPE_BOUNCE;
+ self.move_touch = func_null;
+ self.move_bounce_factor = g_balance_electro_secondary_bouncefactor;
+ self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop;
+ break;
+ */
default:
break;
}
+ setsize(self, self.mins, self.maxs);
}
if(self.gravity)