yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2025-02-16 17:11:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Investigated PVS report for newweap and addressed the issues

Browse source
This commit is contained in:
BjossiAlfreds 2019-09-23 20:59:06 +00:00
parent 81c2f61d51
commit b914e8baf4
1 changed files with 18 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/g_newweap.c
View file

@ -46,7 +46,7 @@ flechette_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf
{
vec3_t dir;
if (!self || !other || !plane || !surf)
if (!self || !other || !plane)
{
return;
}
@ -75,14 +75,7 @@ flechette_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf
}
else
{
if (!plane)
{
VectorClear(dir);
}
else
{
VectorScale(plane->normal, 256, dir);
}
VectorScale(plane->normal, 256, dir);
gi.WriteByte(svc_temp_entity);
gi.WriteByte(TE_FLECHETTE);
@ -124,7 +117,7 @@ fire_flechette(edict_t *self, vec3_t start, vec3_t dir, int damage,
flechette->owner = self;
flechette->touch = flechette_touch;
flechette->nextthink = level.time + 8000 / speed;
flechette->nextthink = level.time + (8000.0f / (float)speed);
flechette->think = G_FreeEdict;
flechette->dmg = damage;
flechette->dmg_radius = kick;
@ -379,7 +372,7 @@ prox_land(edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf)
int stick_ok = 0;
vec3_t land_point;
if (!ent || !other || !plane || !surf)
if (!ent || !other || !plane)
{
return;
}
@ -401,8 +394,7 @@ prox_land(edict_t *ent, edict_t *other, cplane_t *plane, csurface_t *surf)
return;
}
if ((other->svflags & SVF_MONSTER) || other->client ||
(other->svflags & SVF_DAMAGEABLE))
if ((other->svflags & (SVF_MONSTER|SVF_DAMAGEABLE)) || other->client)
{
if (other != ent->teammaster)
{
@ -747,7 +739,7 @@ void
nuke_die(edict_t *self, edict_t *inflictor /* unused */,
edict_t *attacker, int damage, vec3_t point)
{
if (!self || !attacker)
if (!self)
{
return;
}
@ -1486,7 +1478,7 @@ blaster2_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
int mod;
int damagestat;
if (!self || !other || !plane || !surf)
if (!self || !other || !plane)
{
return;
}
@ -1509,19 +1501,17 @@ blaster2_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
if (other->takedamage)
{
/* the only time players will be firing blaster2
bolts will be from the defender sphere. */
if (self->owner->client)
{
mod = MOD_DEFENDER_SPHERE;
}
else
{
mod = MOD_BLASTER2;
}
mod = MOD_BLASTER2;
if (self->owner)
{
/* the only time players will be firing blaster2
bolts will be from the defender sphere. */
if (self->owner->client)
{
mod = MOD_DEFENDER_SPHERE;
}
damagestat = self->owner->takedamage;
self->owner->takedamage = DAMAGE_NO;
@ -1559,16 +1549,7 @@ blaster2_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
gi.WriteByte(svc_temp_entity);
gi.WriteByte(TE_BLASTER2);
gi.WritePosition(self->s.origin);
if (!plane)
{
gi.WriteDir(vec3_origin);
}
else
{
gi.WriteDir(plane->normal);
}
gi.WriteDir(plane->normal);
gi.multicast(self->s.origin, MULTICAST_PVS);
}
@ -1758,7 +1739,7 @@ tracker_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
{
float damagetime;
if (!self || !other || !surf || !plane)
if (!self || !other || !plane)
{
return;
}
@ -1813,7 +1794,6 @@ tracker_touch(edict_t *self, edict_t *other, cplane_t *plane, csurface_t *surf)
}
tracker_explode(self, plane);
return;
}
void
@ -1868,7 +1848,7 @@ fire_tracker(edict_t *self, vec3_t start, vec3_t dir, int damage,
edict_t *bolt;
trace_t tr;
if (!self || !enemy)
if (!self)
{
return;
}