Quake 2 Oop Conversion Project - Source Diff 3.14 vs Ctf 1.02 - p_client.c
diff -s -r q2_314/p_client.c q2_314_ctf/p_client.c
Left File < - 3.14 : p_client.c
Right File > - Ctf 1.02 : p_client.c
Back to Index
186a187
>
271c272
< self->client->resp.score--;
---
> self->client->resp.score--;
348a350,356
> //ZOID
> case MOD_GRAPPLE:
> message = "was caught by";
> message2 = "'s grapple";
> break;
> //ZOID
>
355,360c363,366
< if (ff)
< attacker->client->resp.score--;
< else
< attacker->client->resp.score++;
< }
< return;
---
> if (ff)
> attacker->client->resp.score--;
> else
> attacker->client->resp.score++;
361a368
> return;
363a371
> }
367c375
< self->client->resp.score--;
---
> self->client->resp.score--;
461a470,472
> //ZOID
> self->s.modelindex3 = 0; // remove linked ctf flag
> //ZOID
479a491,493
> //ZOID
> CTFFragBonuses(self, inflictor, attacker);
> //ZOID
481c495,500
< if (deathmatch->value)
---
> //ZOID
> CTFPlayerResetGrapple(self);
> CTFDeadDropFlag(self);
> CTFDeadDropTech(self);
> //ZOID
> if (deathmatch->value && !self->client->showscores)
500c519,522
<
---
> //ZOID
> self->client->anim_priority = ANIM_DEATH;
> self->client->anim_end = 0;
> //ZOID
561a584,591
> //ZOID
> client->pers.lastweapon = item;
> //ZOID
>
> //ZOID
> item = FindItem("Grapple");
> client->pers.inventory[ITEM_INDEX(item)] = 1;
> //ZOID
578a609,612
> //ZOID
> int ctf_team = client->resp.ctf_team;
> //ZOID
>
579a614,618
>
> //ZOID
> client->resp.ctf_team = ctf_team;
> //ZOID
>
581a621,625
>
> //ZOID
> if (ctf->value && client->resp.ctf_team < CTF_TEAM1)
> CTFAssignTeam(client);
> //ZOID
825c869,874
< spot = SelectDeathmatchSpawnPoint ();
---
> //ZOID
> if (ctf->value)
> spot = SelectCTFSpawnPoint(ent);
> else
> //ZOID
> spot = SelectDeathmatchSpawnPoint ();
894a944
>
1052a1103,1105
> //ZOID
> client->ps.pmove.pm_flags &= ~PMF_NO_PREDICTION;
> //ZOID
1088a1142,1146
> //ZOID
> if (CTFStartClient(ent))
> return;
> //ZOID
>
1225c1283,1288
< gi.configstring (CS_PLAYERSKINS+playernum, va("%s\\%s", ent->client->pers.netname, s) );
---
> //ZOID
> if (ctf->value)
> CTFAssignSkin(ent, s);
> else
> //ZOID
> gi.configstring (CS_PLAYERSKINS+playernum, va("%s\\%s", ent->client->pers.netname, s) );
1284a1348,1350
> //ZOID -- force team join
> ent->client->resp.ctf_team = -1;
> //ZOID
1315a1382,1386
> //ZOID
> CTFDeadDropFlag(ent);
> CTFDeadDropTech(ent);
> //ZOID
>
1394a1466,1474
> //ZOID
> if (ent->client->chase_target) {
> client->resp.cmd_angles[0] = SHORT2ANGLE(ucmd->angles[0]);
> client->resp.cmd_angles[1] = SHORT2ANGLE(ucmd->angles[1]);
> client->resp.cmd_angles[2] = SHORT2ANGLE(ucmd->angles[2]);
> return;
> }
> //ZOID
>
1471a1552,1555
> //ZOID
> if (client->ctf_grapple)
> CTFGrapplePull(client->ctf_grapple);
> //ZOID
1502c1586,1590
< if (client->latched_buttons & BUTTON_ATTACK)
---
> if (client->latched_buttons & BUTTON_ATTACK
> //ZOID
> && ent->movetype != MOVETYPE_NOCLIP
> //ZOID
> )
1511c1599,1610
<
---
> //ZOID
> //regen tech
> CTFApplyRegeneration(ent);
> //ZOID
>
> //ZOID
> for (i = 1; i <= maxclients->value; i++) {
> other = g_edicts + i;
> if (other->inuse && other->client->chase_target == ent)
> UpdateChaseCam(other);
> }
> //ZOID
1534c1633,1637
< if (!client->weapon_thunk)
---
> if (!client->weapon_thunk
> //ZOID
> && ent->movetype != MOVETYPE_NOCLIP
> //ZOID
> )