Quake 2 Oop Conversion Project - Source Diff 3.14 vs Ctf 1.02 - p_view.c
diff -s -r q2_314/p_view.c q2_314_ctf/p_view.c
Left File < - 3.14 : p_view.c
Right File > - Ctf 1.02 : p_view.c
Back to Index
111c111
< count = 10; // always make a visible effect
---
> count = 10; // allways make a visible effect
129c129
< // the total alpha of the blend is always proportional to count
---
> // the total alpha of the blend is allways proportional to count
505a506,513
> //ZOID
> // never take damage if just release grapple or on grapple
> if (level.time - ent->client->ctf_grapplereleasetime <= FRAMETIME * 2 ||
> (ent->client->ctf_grapple &&
> ent->client->ctf_grapplestate > CTF_GRAPPLE_STATE_FLY))
> return;
> //ZOID
>
751c759,767
< if (ent->client->quad_framenum > level.framenum)
---
> //ZOID
> CTFEffects(ent);
> //ZOID
>
> if (ent->client->quad_framenum > level.framenum
> //ZOID
> && (level.framenum & 8)
> //ZOID
> )
758c774,778
< if (ent->client->invincible_framenum > level.framenum)
---
> if (ent->client->invincible_framenum > level.framenum
> //ZOID
> && (level.framenum & 8)
> //ZOID
> )
888a909,915
> //ZOID: if on grapple, don't go into jump frame, go into standing
> //frame
> if (client->ctf_grapple) {
> ent->s.frame = FRAME_stand01;
> client->anim_end = FRAME_stand40;
> } else {
> //ZOID
893a921
> }
1031c1059,1078
< G_SetStats (ent);
---
> //ZOID
> if (!ent->client->chase_target)
> //ZOID
> G_SetStats (ent);
>
> //ZOID
> //update chasecam follower stats
> for (i = 1; i <= maxclients->value; i++) {
> edict_t *e = g_edicts + i;
> if (!ent->inuse ||
> e->client->chase_target != ent)
> continue;
> memcpy(e->client->ps.stats,
> ent->client->ps.stats,
> sizeof(ent->client->ps.stats));
> e->client->ps.stats[STAT_LAYOUTS] = 1;
> break;
> }
> //ZOID
>
1051c1098,1103
< DeathmatchScoreboardMessage (ent, ent->enemy);
---
> //ZOID
> if (ent->client->menu) {
> PMenu_Update(ent);
> } else
> //ZOID
> DeathmatchScoreboardMessage (ent, ent->enemy);