Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - g_trigger.c
diff -s -r q2_305/g_trigger.c q2_314/g_trigger.c
Left File < - 3.05/g_trigger.c
Right File > - 3.14/g_trigger.c
Back to Index
55c55
< if(strcmp(other->classname, "player") == 0)

---
> if(other->client)
214c214,256
< activator->client->pers.inventory[index]--;
---
> if (coop->value)
> {
> int player;
> edict_t *ent;
>
> if (strcmp(self->item->classname, "key_power_cube") == 0)
> {
> int cube;
>
> for (cube = 0; cube < 8; cube++)
> if (activator->client->pers.power_cubes & (1 << cube))
> break;
> for (player = 1; player <= game.maxclients; player++)
> {
> ent = &g_edicts[player];
> if (!ent->inuse)
> continue;
> if (!ent->client)
> continue;
> if (ent->client->pers.power_cubes & (1 << cube))
> {
> ent->client->pers.inventory[index]--;
> ent->client->pers.power_cubes &= ~(1 << cube);
> }
> }
> }
> else
> {
> for (player = 1; player <= game.maxclients; player++)
> {
> ent = &g_edicts[player];
> if (!ent->inuse)
> continue;
> if (!ent->client)
> continue;
> ent->client->pers.inventory[index] = 0;
> }
> }
> }
> else
> {
> activator->client->pers.inventory[index]--;
> }
432c474
< T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, self->dmg, dflags);
---
> T_Damage (other, self, self, vec3_origin, other->s.origin, vec3_origin, self->dmg, self->dmg, dflags, MOD_TRIGGER_HURT);