Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - g_target.c
diff -s -r q2_305/g_target.c q2_314/g_target.c
Left File < - 3.05/g_target.c
Right File > - 3.14/g_target.c
Back to Index
36c36
< Looped sounds are allways atten 3 / vol 1, and the use function toggles it on/off.
---
> Looped sounds are always atten 3 / vol 1, and the use function toggles it on/off.
106,107c106
< // set the help icon on all clients
< game.helpchanged = true;
---
> game.helpchanged++;
133a133
> These are single use targets.
141a142
> G_FreeEdict (ent);
157a159,161
> // map bug hack
> if (!stricmp(level.mapname, "mine3") && ent->s.origin[0] == 280 && ent->s.origin[1] == -2048 && ent->s.origin[2] == -624)
> ent->message = "You have found a secret area.";
163a168
> These are single use targets.
174a180
> G_FreeEdict (ent);
211c217
< T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40);
---
> T_RadiusDamage (self, self->activator, self->dmg, NULL, self->dmg+40, MOD_EXPLOSIVE);
248c254,260
< return; // allready activated
---
> return; // already activated
>
> if (!deathmatch->value && !coop->value)
> {
> if (g_edicts[1].health <= 0)
> return;
> }
251c263
< if (deathmatch->value && noexit->value && other != world)
---
> if (deathmatch->value && !( (int)dmflags->value & DF_ALLOW_EXIT) && other != world)
253c265
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 10 * other->max_health, 1000, 0);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, 10 * other->max_health, 1000, 0, MOD_EXIT);
260,261c272,273
< if (other && other->client)
< gi.bprintf (PRINT_HIGH, "%s exited the level.\n", other->client->pers.netname);
---
> if (activator && activator->client)
> gi.bprintf (PRINT_HIGH, "%s exited the level.\n", activator->client->pers.netname);
278a291,295
>
> // ugly hack because *SOMEBODY* screwed up their map
> if((stricmp(level.mapname, "fact1") == 0) && (stricmp(ent->map, "fact3") == 0))
> ent->map = "fact3$secret1";
>
313c330
< T_RadiusDamage (self, activator, self->dmg, NULL, self->dmg+40);
---
> T_RadiusDamage (self, activator, self->dmg, NULL, self->dmg+40, MOD_SPLASH);
391c408
< fire_blaster (self, self->s.origin, self->movedir, self->dmg, self->speed, EF_BLASTER);
---
> fire_blaster (self, self->s.origin, self->movedir, self->dmg, self->speed, EF_BLASTER, MOD_TARGET_BLASTER);
468,469d484
< static vec3_t lmins = {-4, -4, -4};
< static vec3_t lmaxs = {4, 4, 4};
497,498c512,513
< if ((tr.ent->takedamage) && !(tr.ent->flags & FL_IMMUNE_LASER) && (tr.ent != self->owner))
< T_Damage (tr.ent, self, self->owner, self->movedir, tr.endpos, vec3_origin, self->dmg, 1, DAMAGE_ENERGY);
---
> if ((tr.ent->takedamage) && !(tr.ent->flags & FL_IMMUNE_LASER))
> T_Damage (tr.ent, self, self->activator, self->movedir, tr.endpos, vec3_origin, self->dmg, 1, DAMAGE_ENERGY, MOD_TARGET_LASER);
527a543,544
> if (!self->activator)
> self->activator = self;
541a559
> self->activator = activator;
574,576d591
<
< if (!self->owner)
< self->owner = self;