From 24cdf52a89a228e607f7a4413023df40b441cf6d Mon Sep 17 00:00:00 2001 From: Vortex Acherontic Date: Sat, 17 Jul 2021 22:42:25 +0200 Subject: [PATCH 1/5] Fixed TripBomb not inflicting damage --- src/zaero/weapon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zaero/weapon.c b/src/zaero/weapon.c index cda716c..65a5ac6 100644 --- a/src/zaero/weapon.c +++ b/src/zaero/weapon.c @@ -1,5 +1,6 @@ #include "../header/local.h" #include "../monster/misc/player.h" +#include extern qboolean is_quad; extern byte is_silenced; @@ -116,7 +117,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); From 023b41606e486506fcc17c0fcc6a9b49f457a42e Mon Sep 17 00:00:00 2001 From: Vortex Acherontic Date: Sat, 17 Jul 2021 22:44:03 +0200 Subject: [PATCH 2/5] Removed unused import --- src/zaero/weapon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/zaero/weapon.c b/src/zaero/weapon.c index 65a5ac6..91a17c7 100644 --- a/src/zaero/weapon.c +++ b/src/zaero/weapon.c @@ -1,6 +1,5 @@ #include "../header/local.h" #include "../monster/misc/player.h" -#include extern qboolean is_quad; extern byte is_silenced; From d4b76a5326615508c18b6b6bdaf80066b6c2ce9b Mon Sep 17 00:00:00 2001 From: Vortex Acherontic Date: Sun, 18 Jul 2021 15:35:10 +0200 Subject: [PATCH 3/5] #2 Fixed insane marine not killed by explosion --- src/g_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_target.c b/src/g_target.c index 43c9943..1c49a83 100644 --- a/src/g_target.c +++ b/src/g_target.c @@ -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; From fc2961df12e284c7e58448f268bc62ef37757960 Mon Sep 17 00:00:00 2001 From: Vortex Acherontic Date: Sun, 18 Jul 2021 15:41:33 +0200 Subject: [PATCH 4/5] #1 Fixed viper bomb not killing monster_tank in zbase1 --- src/g_misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/g_misc.c b/src/g_misc.c index a62d1b6..1dfc235 100644 --- a/src/g_misc.c +++ b/src/g_misc.c @@ -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); } From f28a5617889e72f7c3c942f03ba254b2964a6d27 Mon Sep 17 00:00:00 2001 From: Vortex Acherontic Date: Sun, 18 Jul 2021 16:29:58 +0200 Subject: [PATCH 5/5] Fixed visor not working --- src/zaero/item.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/zaero/item.c b/src/zaero/item.c index f6c171e..3cb3e40 100644 --- a/src/zaero/item.c +++ b/src/zaero/item.c @@ -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)