rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-22 20:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

no message

Browse source
This commit is contained in:
Duff Man 2001-06-25 23:46:12 +00:00
parent bd29c2e1e8
commit 6164ae8a10
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reaction/game/g_client.c
View file

@ -1205,7 +1205,8 @@ void ClientSpawn(gentity_t *ent) {
client->bleedtick =0; client->bleedtick =0;
// health will count down towards max_health // health will count down towards max_health
ent->health = client->ps.stats[STAT_HEALTH] = 100;// max health of 100 client->ps.stats[STAT_MAX_HEALTH];//Blaze: removed * 1.25 becase we wanna start at 100 health ent->health = client->ps.stats[STAT_HEALTH] = 100;// max health of 100 client->ps.stats[STAT_MAX_HEALTH];//Blaze: removed * 1.25 becase we wanna start at 100 health
// reset streak count
client->ps.stats[STAT_STREAK] = 0;
G_SetOrigin( ent, spawn_origin ); G_SetOrigin( ent, spawn_origin );
VectorCopy( spawn_origin, client->ps.origin ); VectorCopy( spawn_origin, client->ps.origin );

33
reaction/game/g_combat.c
View file

@ -499,6 +499,7 @@ player_die
*/ */
void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath ) { void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath ) {
gentity_t *ent; gentity_t *ent;
gentity_t *DMReward;
int anim; int anim;
int contents; int contents;
int killer; int killer;
@ -529,6 +530,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
//self->client->isBandaging = qfalse; //self->client->isBandaging = qfalse;
self->client->ps.stats[STAT_RQ3] &= ~RQ3_BANDAGE_WORK; self->client->ps.stats[STAT_RQ3] &= ~RQ3_BANDAGE_WORK;
self->client->ps.stats[STAT_RQ3] &= ~RQ3_BANDAGE_NEED; self->client->ps.stats[STAT_RQ3] &= ~RQ3_BANDAGE_NEED;
self->client->ps.stats[STAT_STREAK] = 0;
} }
if ( self->client->ps.pm_type == PM_DEAD ) { if ( self->client->ps.pm_type == PM_DEAD ) {
return; return;
@ -599,7 +601,38 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if ( attacker == self || OnSameTeam (self, attacker ) ) { if ( attacker == self || OnSameTeam (self, attacker ) ) {
AddScore( attacker, self->r.currentOrigin, -1 ); AddScore( attacker, self->r.currentOrigin, -1 );
} else { } else {
attacker->client->ps.stats[STAT_STREAK]++;
if (attacker->client->ps.stats[STAT_STREAK] < 4)
AddScore( attacker, self->r.currentOrigin, 1 ); AddScore( attacker, self->r.currentOrigin, 1 );
else if (attacker->client->ps.stats[STAT_STREAK] < 8)
{ AddScore( attacker, self->r.currentOrigin, 2 );
DMReward = G_TempEntity(self->r.currentOrigin ,EV_DMREWARD);
DMReward->s.otherEntityNum2 = killer;
DMReward->s.eventParm = attacker->client->ps.stats[STAT_STREAK];
DMReward->r.svFlags = SVF_BROADCAST;
}
else if (attacker->client->ps.stats[STAT_STREAK] < 16)
{ AddScore( attacker, self->r.currentOrigin, 4 );
DMReward = G_TempEntity(self->r.currentOrigin ,EV_DMREWARD);
DMReward->s.otherEntityNum2 = killer;
DMReward->s.eventParm = attacker->client->ps.stats[STAT_STREAK];
DMReward->r.svFlags = SVF_BROADCAST;
}
else if (attacker->client->ps.stats[STAT_STREAK] < 32)
{ AddScore( attacker, self->r.currentOrigin, 8 );
DMReward = G_TempEntity(self->r.currentOrigin ,EV_DMREWARD);
DMReward->s.otherEntityNum2 = killer;
DMReward->s.eventParm = attacker->client->ps.stats[STAT_STREAK];
DMReward->r.svFlags = SVF_BROADCAST;
}
else
{ AddScore( attacker, self->r.currentOrigin, 16 );
DMReward = G_TempEntity(self->r.currentOrigin ,EV_DMREWARD);
DMReward->s.otherEntityNum2 = killer;
DMReward->s.eventParm = attacker->client->ps.stats[STAT_STREAK];
DMReward->r.svFlags = SVF_BROADCAST;
}
if( meansOfDeath == MOD_GAUNTLET ) { if( meansOfDeath == MOD_GAUNTLET ) {