Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - g_misc.c
diff -s -r q2_305/g_misc.c q2_314/g_misc.c
Left File < - 3.05/g_misc.c
Right File > - 3.14/g_misc.c
Back to Index
28c28
< ent->count = 0; // allways start closed;
---
> ent->count = 0; // always start closed;
241a242,247
> if (self->client) // bodies in the queue don't have a client anymore
> {

> self->client->anim_priority = ANIM_DEATH;
> self->client->anim_end = self->s.frame;
> }
>
409c415
< else if ((self->spawnflags & 1) && !(self->flags & (FL_SWIM|FL_FLY)))
---
> else if ((self->spawnflags & 1) && !(other->flags & (FL_SWIM|FL_FLY)))
444a451,455
> if (deathmatch->value)
> {
> G_FreeEdict (self);
> return;
> }
457,458d467
< static int robotron[4];
<
462d470
< // ent->s.frame = (ent->s.frame + 1) % 9;
464,473d471
< // return;
<
< if (ent->spawnflags)
< {
< if (ent->s.frame == 0)
< {
< ent->spawnflags = (ent->spawnflags + 1) % 4 + 1;
< ent->s.modelindex = robotron[ent->spawnflags - 1];
< }
< }
485d482
< // ent->s.modelindex = gi.modelindex ("models/player_y/tris.md2");
652c649
< T_Damage (other, self, self, vec3_origin, self->s.origin, vec3_origin, self->dmg, 1, 0);
---
> T_Damage (other, self, self, vec3_origin, self->s.origin, vec3_origin, self->dmg, 1, 0, MOD_CRUSH);
739c736
< T_RadiusDamage (self, attacker, self->dmg, NULL, self->dmg+40);
---
> T_RadiusDamage (self, attacker, self->dmg, NULL, self->dmg+40, MOD_EXPLOSIVE);
871c868
< T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40);
---
> T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40, MOD_BARREL);
1313c1310
< T_RadiusDamage (self, self, self->dmg, NULL, self->dmg+40);
---
> T_RadiusDamage (self, self, self->dmg, NULL, self->dmg+40, MOD_BOMB);
1779c1776,1777
< other->s.origin[2] += 9;
---
> VectorCopy (dest->s.origin, other->s.old_origin);
> other->s.origin[2] += 10;
1783c1781,1782
< other->client->ps.pmove.teleport_time = 50;
---
> other->client->ps.pmove.pm_time = 160>>3; // hold time
> other->client->ps.pmove.pm_flags |= PMF_TIME_TELEPORT;
1785c1784,1785
< // draw the teleport splash at the destination
---
> // draw the teleport splash at source and on the player
> self->owner->s.event = EV_PLAYER_TELEPORT;
1792,1796c1792,1794
< other->s.angles[PITCH] = 0;
< other->s.angles[YAW] = self->s.angles[YAW];
< other->s.angles[ROLL] = 0;
< VectorCopy (self->s.angles, other->client->ps.viewangles);
< VectorCopy (self->s.angles, other->client->v_angle);
---
> VectorClear (other->s.angles);
> VectorClear (other->client->ps.viewangles);
> VectorClear (other->client->v_angle);
1799,1801c1797
< if (!KillBox (other))
< {
< }
---
> KillBox (other);
1821a1818,1819
> ent->s.effects = EF_TELEPORTER;
> ent->s.sound = gi.soundindex ("world/amb10.wav");
1823d1820
< // ent->s.effects |= EF_FLIES;
1832a1830
> trig->owner = ent;