Make gibs and debris SOLID_BBOX so they move on entities.

This commit is contained in:
Yamagi Burmeister 2016-04-29 17:44:52 +02:00
parent 89cb707444
commit 7e7ed6bf94

View file

@ -200,7 +200,7 @@ ThrowGib(edict_t *self, char *gibname, int damage, int type)
gib->s.origin[2] = origin[2] + crandom() * size[2]; gib->s.origin[2] = origin[2] + crandom() * size[2];
gi.setmodel(gib, gibname); gi.setmodel(gib, gibname);
gib->solid = SOLID_NOT; gib->solid = SOLID_BBOX;
gib->s.effects |= EF_GIB; gib->s.effects |= EF_GIB;
gib->flags |= FL_NO_KNOCKBACK; gib->flags |= FL_NO_KNOCKBACK;
gib->takedamage = DAMAGE_YES; gib->takedamage = DAMAGE_YES;
@ -250,7 +250,7 @@ ThrowHead(edict_t *self, char *gibname, int damage, int type)
self->s.modelindex2 = 0; self->s.modelindex2 = 0;
gi.setmodel(self, gibname); gi.setmodel(self, gibname);
self->solid = SOLID_NOT; self->solid = SOLID_BBOX;
self->s.effects |= EF_GIB; self->s.effects |= EF_GIB;
self->s.effects &= ~EF_FLIES; self->s.effects &= ~EF_FLIES;
self->s.sound = 0; self->s.sound = 0;
@ -312,7 +312,7 @@ ThrowClientHead(edict_t *self, int damage)
VectorSet(self->maxs, 16, 16, 16); VectorSet(self->maxs, 16, 16, 16);
self->takedamage = DAMAGE_NO; self->takedamage = DAMAGE_NO;
self->solid = SOLID_NOT; self->solid = SOLID_BBOX;
self->s.effects = EF_GIB; self->s.effects = EF_GIB;
self->s.sound = 0; self->s.sound = 0;
self->flags |= FL_NO_KNOCKBACK; self->flags |= FL_NO_KNOCKBACK;
@ -378,7 +378,7 @@ ThrowDebris(edict_t *self, char *modelname, float speed, vec3_t origin)
v[2] = 100 + 100 * crandom(); v[2] = 100 + 100 * crandom();
VectorMA(self->velocity, speed, v, chunk->velocity); VectorMA(self->velocity, speed, v, chunk->velocity);
chunk->movetype = MOVETYPE_BOUNCE; chunk->movetype = MOVETYPE_BOUNCE;
chunk->solid = SOLID_NOT; chunk->solid = SOLID_BBOX;
chunk->avelocity[0] = random() * 600; chunk->avelocity[0] = random() * 600;
chunk->avelocity[1] = random() * 600; chunk->avelocity[1] = random() * 600;
chunk->avelocity[2] = random() * 600; chunk->avelocity[2] = random() * 600;
@ -2166,7 +2166,7 @@ SP_misc_gib_arm(edict_t *ent)
} }
gi.setmodel(ent, "models/objects/gibs/arm/tris.md2"); gi.setmodel(ent, "models/objects/gibs/arm/tris.md2");
ent->solid = SOLID_NOT; ent->solid = SOLID_BBOX;
ent->s.effects |= EF_GIB; ent->s.effects |= EF_GIB;
ent->takedamage = DAMAGE_YES; ent->takedamage = DAMAGE_YES;
ent->die = gib_die; ent->die = gib_die;
@ -2194,7 +2194,7 @@ SP_misc_gib_leg(edict_t *ent)
} }
gi.setmodel(ent, "models/objects/gibs/leg/tris.md2"); gi.setmodel(ent, "models/objects/gibs/leg/tris.md2");
ent->solid = SOLID_NOT; ent->solid = SOLID_BBOX;
ent->s.effects |= EF_GIB; ent->s.effects |= EF_GIB;
ent->takedamage = DAMAGE_YES; ent->takedamage = DAMAGE_YES;
ent->die = gib_die; ent->die = gib_die;
@ -2222,7 +2222,7 @@ SP_misc_gib_head(edict_t *ent)
} }
gi.setmodel(ent, "models/objects/gibs/head/tris.md2"); gi.setmodel(ent, "models/objects/gibs/head/tris.md2");
ent->solid = SOLID_NOT; ent->solid = SOLID_BBOX;
ent->s.effects |= EF_GIB; ent->s.effects |= EF_GIB;
ent->takedamage = DAMAGE_YES; ent->takedamage = DAMAGE_YES;
ent->die = gib_die; ent->die = gib_die;