mirror of
https://github.com/yquake2/zaero.git
synced 2024-11-10 06:32:04 +00:00
Merge pull request #23 from VortexAcherontic/master
Multiple gameplay fixes
This commit is contained in:
commit
9757d6fffc
4 changed files with 3 additions and 8 deletions
|
@ -1682,7 +1682,7 @@ void misc_viper_bomb_touch (edict_t *self, edict_t *other, cplane_t *plane, csur
|
|||
G_UseTargets (self, self->activator);
|
||||
|
||||
self->s.origin[2] = self->absmin[2] + 1;
|
||||
T_RadiusDamage (self, self, self->dmg, NULL, self->dmg+40, MOD_BOMB);
|
||||
T_RadiusDamage (self, self, self->dmg, self, self->dmg+40, MOD_BOMB);
|
||||
BecomeExplosion2 (self);
|
||||
}
|
||||
|
||||
|
|
|
@ -325,7 +325,7 @@ void target_explosion_explode (edict_t *self)
|
|||
gi.multicast (self->s.origin, MULTICAST_PHS);
|
||||
}
|
||||
|
||||
T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40, MOD_EXPLOSIVE);
|
||||
T_RadiusDamage (self, self->activator, self->dmg, self, self->dmg+40, MOD_EXPLOSIVE);
|
||||
|
||||
save = self->delay;
|
||||
self->delay = 0;
|
||||
|
|
|
@ -214,11 +214,6 @@ edict_t *findNextCamera(edict_t *old)
|
|||
{
|
||||
edict_t *e = NULL;
|
||||
|
||||
if (!old)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// first of all, are there *any* cameras?
|
||||
e = G_Find(NULL, FOFS(classname), "misc_securitycamera");
|
||||
if (e == NULL)
|
||||
|
|
|
@ -116,7 +116,7 @@ void TripBomb_Explode (edict_t *ent)
|
|||
return;
|
||||
}
|
||||
|
||||
T_RadiusDamage(ent, ent->owner ? ent->owner : ent, ent->dmg, ent->enemy, ent->dmg_radius, MOD_TRIPBOMB);
|
||||
T_RadiusDamage(ent, ent->owner ? ent->owner : ent, ent->dmg, ent, ent->dmg_radius, MOD_TRIPBOMB);
|
||||
|
||||
VectorMA (ent->s.origin, -0.02, ent->velocity, origin);
|
||||
|
||||
|
|
Loading…
Reference in a new issue