rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-24 20:51:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug 4138

Browse source 
Spawn the explosion from the impact point
This commit is contained in:
Scott Brooks 2009-07-01 19:24:56 +00:00
parent 39d26f7b4f
commit b4a5bc26ed
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reaction/game/g_misc.c
View file

@ -967,13 +967,13 @@ void func_breakable_explode(gentity_t * self, vec3_t pos)
// Blaze: adding for func_breakable explosions // Blaze: adding for func_breakable explosions
void func_breakable_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, int damage, int meansOfDeath) void func_breakable_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, int damage, int meansOfDeath, vec3_t impactPoint)
{ {
func_breakable_explode(self, self->s.origin); func_breakable_explode(self, impactPoint);
// G_ExplodeMissile(self); // G_ExplodeMissile(self);
//Makro - added check //Makro - added check
if (self->damage > 0 && self->damage_radius > 0) if (self->damage > 0 && self->damage_radius > 0)
G_RadiusDamage(self->s.origin, attacker, self->damage, self->damage_radius, self, meansOfDeath); G_RadiusDamage(impactPoint, attacker, self->damage, self->damage_radius, self, meansOfDeath);
// radius damage // radius damage
trap_RQ3UnlinkEntity(self, __LINE__, __FILE__); trap_RQ3UnlinkEntity(self, __LINE__, __FILE__);
@ -1331,7 +1331,7 @@ void G_BreakGlass(gentity_t * ent, gentity_t * inflictor, gentity_t * attacker,
if (ent->explosive) { if (ent->explosive) {
mod = MOD_TRIGGER_HURT; mod = MOD_TRIGGER_HURT;
func_breakable_die(ent, inflictor, attacker, damage, mod); func_breakable_die(ent, inflictor, attacker, damage, mod, impactPoint);
} }
G_UseTargets(ent, ent->activator); G_UseTargets(ent, ent->activator);
//G_FreeEntity( ent, __LINE__, __FILE__ ); //G_FreeEntity( ent, __LINE__, __FILE__ );