rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 15:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

func_breakable explode fix

Browse source
This commit is contained in:
Scott Brooks 2002-04-08 20:14:34 +00:00
parent c93a3fcc1f
commit adec4cb715
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reaction/game/g_misc.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.29 2002/04/08 20:14:34 blaze
// func_breakable explode fix
//
// Revision 1.28 2002/04/05 06:50:25 blaze
// breakables should now respawn when the round restarts( when g_teamplay:SpawnPlayers() is called to be exact)
//
@ -451,7 +454,6 @@ void func_breakable_die( gentity_t *self, gentity_t *inflictor, gentity_t *attac
G_ExplodeMissile(self);
// radius damage
}
@ -677,13 +679,11 @@ void G_BreakGlass( gentity_t *ent, gentity_t *inflictor, gentity_t *attacker, ve
break;
}
if (ent->explosive)
if (ent->explosive && strcmp(g_entities[ENTITYNUM_WORLD].classname,"worldspawn"))
{
mod = MOD_TRIGGER_HURT;
func_breakable_die(ent, inflictor, attacker, damage, mod);
}
//unlink it instead of freeing
trap_UnlinkEntity(ent);
//G_FreeEntity( ent );
//G_Printf("%s shift: %i\n", vtos(impactPoint), shiftCount);
switch ( shiftCount )
@ -756,6 +756,8 @@ void G_BreakGlass( gentity_t *ent, gentity_t *inflictor, gentity_t *attacker, ve
tent = G_TempEntity2( impactPoint, EV_CHIP_GLASS, eParm);
}
//unlink it instead of freeing
trap_UnlinkEntity(ent);
}

5
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.62 2002/04/08 20:14:34 blaze
// func_breakable explode fix
//
// Revision 1.61 2002/04/07 12:49:10 slicer
// Added 'teamname' command for MM, and tweaked the cvar system.
//
@ -685,7 +688,7 @@ void SpawnPlayers()
for (i=0;i<level.num_entities; i++)
{
ent = &g_entities[i];
if (ent->classname != NULL && !strcmp(ent->classname, "func_breakable"))
if (ent != NULL && ent->classname != NULL && !strcmp(ent->classname, "func_breakable"))
{
//re-link all unlinked breakables
trap_LinkEntity(ent);