Quake 2 Oop Conversion Project - Source Diff 3.05 vs 3.14 - p_view.c
diff -s -r q2_305/p_view.c q2_314/p_view.c
Left File < - 3.05/p_view.c
Right File > - 3.14/p_view.c
Back to Index
69c69
< if (client->damage_armor)

---
> if (client->damage_armor && !(player->flags & FL_GODMODE) && (client->invincible_framenum <= level.framenum))
77,78c77,78
< // start a pain animation
< if (client->anim_priority < ANIM_PAIN)
---
> // start a pain animation if still in the player model
> if (client->anim_priority < ANIM_PAIN && player->s.modelindex == 255)
111c111
< count = 10; // allways make a visible effect
---
> count = 10; // always make a visible effect
114c114
< if (level.time > player->pain_debounce_time)
---
> if ((level.time > player->pain_debounce_time) && !(player->flags & FL_GODMODE) && (client->invincible_framenum <= level.framenum))
126c126
< gi.sound (player, CHAN_VOICE, SexedSoundIndex(player, va("pain%i_%i", l, r)), 1, ATTN_NORM, 0);
---
> gi.sound (player, CHAN_VOICE, gi.soundindex(va("*pain%i_%i.wav", l, r)), 1, ATTN_NORM, 0);
129c129
< // the total alpha of the blend is allways proportional to count
---
> // the total alpha of the blend is always proportional to count
421c421
< SV_AddBlend (0.5, 0.3, 0.2, 0.5, ent->client->ps.blend);
---
> SV_AddBlend (0.5, 0.3, 0.2, 0.4, ent->client->ps.blend);
491c491
< if (!ent->groundentity)
---
> if (ent->movetype == MOVETYPE_NOCLIP)
494c494,503
< delta = ent->velocity[2] - ent->client->oldvelocity[2];
---
> if ((ent->client->oldvelocity[2] < 0) && (ent->velocity[2] > ent->client->oldvelocity[2]) && (!ent->groundentity))
> {
> delta = ent->client->oldvelocity[2];
> }
> else
> {
> if (!ent->groundentity)
> return;
> delta = ent->velocity[2] - ent->client->oldvelocity[2];
> }
523,529c532,533
< if (!strcmp (ent->client->pers.sounddir, "player/female"))
< {
< if (delta >= 55)
< ent->s.event = EV_FEMALE_FALLFAR;
< else
< ent->s.event = EV_FEMALE_FALL;
< }
---
> if (delta >= 55)
> ent->s.event = EV_FALLFAR;
531,536c535
< {
< if (delta >= 55)
< ent->s.event = EV_MALE_FALLFAR;
< else
< ent->s.event = EV_MALE_FALL;
< }
---
> ent->s.event = EV_FALL;
545c544
< T_Damage (ent, world, world, dir, ent->s.origin, vec3_origin, damage, 0, 0);
---
> T_Damage (ent, world, world, dir, ent->s.origin, vec3_origin, damage, 0, 0, MOD_FALLING);
668,669c667,670
< if (rand()&1)
< gi.sound (current_player, CHAN_VOICE, SexedSoundIndex(current_player, "gurp1"), 1, ATTN_NORM, 0);
---
> if (current_player->health <= current_player->dmg)
> gi.sound (current_player, CHAN_VOICE, gi.soundindex("player/drown1.wav"), 1, ATTN_NORM, 0);
> else if (rand()&1)
> gi.sound (current_player, CHAN_VOICE, gi.soundindex("*gurp1.wav"), 1, ATTN_NORM, 0);
671c672,673
< gi.sound (current_player, CHAN_VOICE, SexedSoundIndex(current_player, "gurp2"), 1, ATTN_NORM, 0);
---
> gi.sound (current_player, CHAN_VOICE, gi.soundindex("*gurp2.wav"), 1, ATTN_NORM, 0);
>
674c676
< T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, current_player->dmg, 0, DAMAGE_NO_ARMOR);
---
> T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, current_player->dmg, 0, DAMAGE_NO_ARMOR, MOD_WATER);
692c694,695
< && current_player->pain_debounce_time <= level.time)
---
> && current_player->pain_debounce_time <= level.time
> && current_client->invincible_framenum < level.framenum)
702c705
< T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 1*waterlevel, 0, 0);
---
> T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 1*waterlevel, 0, 0, MOD_LAVA);
704c707
< T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 3*waterlevel, 0, 0);
---
> T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 3*waterlevel, 0, 0, MOD_LAVA);
711c714
< T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 1*waterlevel, 0, 0);
---
> T_Damage (current_player, world, world, vec3_origin, current_player->s.origin, vec3_origin, 1*waterlevel, 0, 0, MOD_SLIME);
797,798c800,809
< // help beep
< if (game.helpchanged && !(level.framenum&63) )
---
> if (ent->client->resp.game_helpchanged != game.helpchanged)
> {
> ent->client->resp.game_helpchanged = game.helpchanged;
> ent->client->resp.helpchanged = 1;
> }
>
> // help beep (no more than three times)
> if (ent->client->resp.helpchanged && ent->client->resp.helpchanged <= 3 && !(level.framenum&63) )
> {
> ent->client->resp.helpchanged++;
799a811
> }
1037c1049
< if (ent->client->showscores && deathmatch->value && !(level.framenum & 31) )
---
> if (ent->client->showscores && !(level.framenum & 31) )