Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - g_func.c
diff -s -r q2_305/g_func.c q2_314/g_func.c
Left File < - 3.05/g_func.c
Right File > - 3.14/g_func.c
Back to Index
390c390
< if (!(other->svflags & SVF_MONSTER) && (!other->client))

---
> if (!(other->svflags & SVF_MONSTER) && (!other->client) )
393c393
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0, MOD_CRUSH);
395c395,396
< BecomeExplosion1 (other);
---
> if (other)
> BecomeExplosion1 (other);
399c400
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
577c578
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
583c584
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
807c808
< allready targeted by another
---
> already targeted by another
1060c1061
< if (!(other->svflags & SVF_MONSTER) && (!other->client))
---
> if (!(other->svflags & SVF_MONSTER) && (!other->client) )
1063c1064
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0, MOD_CRUSH);
1065c1066,1067
< BecomeExplosion1 (other);
---
> if (other)
> BecomeExplosion1 (other);
1069c1071
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
1137a1140,1142
> if (deathmatch->value)
> ent->speed *= 2;
>
1324a1330,1333
> // to simplify logic elsewhere, make non-teamed doors into a team of one
> if (!ent->team)
> ent->teammaster = ent;
>
1435c1444
< if (!(other->svflags & SVF_MONSTER) && (!other->client))
---
> if (!(other->svflags & SVF_MONSTER) && (!other->client) )
1438c1447
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0, MOD_CRUSH);
1451c1460
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
1914c1923
< if (!(other->svflags & SVF_MONSTER) && (!other->client))
---
> if (!(other->svflags & SVF_MONSTER) && (!other->client) )
1917c1926
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 100000, 1, 0, MOD_CRUSH);
1919c1928,1929
< BecomeExplosion1 (other);
---
> if (other)
> BecomeExplosion1 (other);
1927c1937
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);