rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-30 07:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added sniper headshot and hc really hard hit gibbing. HC event gets lost

Browse source 
between game and cgame
This commit is contained in:
Richard Allen 2002-05-19 04:48:50 +00:00
parent 1afec22049
commit 275e4a8821
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
reaction/game/g_combat.c
View file

@ -5,6 +5,10 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.78 2002/05/19 04:48:50 jbravo
// Added sniper headshot and hc really hard hit gibbing. HC event gets lost
// between game and cgame
//
// Revision 1.77 2002/05/18 14:52:16 makro // Revision 1.77 2002/05/18 14:52:16 makro
// Bot stuff. Other stuff. Just... stuff :p // Bot stuff. Other stuff. Just... stuff :p
// //
@ -1088,9 +1092,10 @@ 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 *DMReward; gentity_t *DMReward;
int anim, contents, killer, i; int anim, contents, killer, i, hurt;
char *killerName, *obit; char *killerName, *obit;
hurt = 0;
//Blaze: Stop bleeding when dead //Blaze: Stop bleeding when dead
if ( self->client ) if ( self->client )
{ {
@ -1185,6 +1190,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if (attacker && attacker->client) attacker->client->pers.records[REC_HEADKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_HEADKILLS]++;
} }
PrintDeathMessage (self, attacker, LOC_HDAM, meansOfDeath); PrintDeathMessage (self, attacker, LOC_HDAM, meansOfDeath);
hurt = LOC_HDAM;
} }
else if ((self->client->lasthurt_location & LOCATION_CHEST) == LOCATION_CHEST || else if ((self->client->lasthurt_location & LOCATION_CHEST) == LOCATION_CHEST ||
(self->client->lasthurt_location & LOCATION_SHOULDER) == LOCATION_SHOULDER) { (self->client->lasthurt_location & LOCATION_SHOULDER) == LOCATION_SHOULDER) {
@ -1194,6 +1200,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if (attacker && attacker->client) attacker->client->pers.records[REC_CHESTKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_CHESTKILLS]++;
} }
PrintDeathMessage (self, attacker, LOC_CDAM, meansOfDeath); PrintDeathMessage (self, attacker, LOC_CDAM, meansOfDeath);
hurt = LOC_CDAM;
} }
else if ((self->client->lasthurt_location & LOCATION_STOMACH) == LOCATION_STOMACH || else if ((self->client->lasthurt_location & LOCATION_STOMACH) == LOCATION_STOMACH ||
(self->client->lasthurt_location & LOCATION_GROIN) == LOCATION_GROIN) { (self->client->lasthurt_location & LOCATION_GROIN) == LOCATION_GROIN) {
@ -1203,6 +1210,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if (attacker && attacker->client) attacker->client->pers.records[REC_STOMACHKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_STOMACHKILLS]++;
} }
PrintDeathMessage (self, attacker, LOC_SDAM, meansOfDeath); PrintDeathMessage (self, attacker, LOC_SDAM, meansOfDeath);
hurt = LOC_SDAM;
} }
else if ((self->client->lasthurt_location & LOCATION_LEG) == LOCATION_LEG || else if ((self->client->lasthurt_location & LOCATION_LEG) == LOCATION_LEG ||
(self->client->lasthurt_location & LOCATION_FOOT) == LOCATION_FOOT) { (self->client->lasthurt_location & LOCATION_FOOT) == LOCATION_FOOT) {
@ -1212,9 +1220,11 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
if (attacker && attacker->client) attacker->client->pers.records[REC_LEGKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_LEGKILLS]++;
} }
PrintDeathMessage (self, attacker, LOC_LDAM, meansOfDeath); PrintDeathMessage (self, attacker, LOC_LDAM, meansOfDeath);
hurt = LOC_LDAM;
} else { } else {
// // non-location/world kill // // non-location/world kill
PrintDeathMessage (self, attacker, LOC_NOLOC, meansOfDeath); PrintDeathMessage (self, attacker, LOC_NOLOC, meansOfDeath);
hurt = 0;
} }
Cmd_Unzoom(self); Cmd_Unzoom(self);
@ -1284,10 +1294,6 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
break; break;
} }
} }
/* ent->s.eventParm = meansOfDeath;
ent->s.otherEntityNum = self->s.number;
ent->s.otherEntityNum2 = killer;
ent->r.svFlags = SVF_BROADCAST; // send to everyone */
self->enemy = attacker; self->enemy = attacker;
if (level.team_round_going) { if (level.team_round_going) {
//Makro - crash bug fix //Makro - crash bug fix
@ -1502,6 +1508,14 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
// remove powerups // remove powerups
memset(self->client->ps.powerups, 0, sizeof(self->client->ps.powerups)); memset(self->client->ps.powerups, 0, sizeof(self->client->ps.powerups));
// JBravo: AQ style Sniper and HC gibbing
if ((meansOfDeath == MOD_SNIPER && hurt == LOC_HDAM) || (meansOfDeath == MOD_HANDCANNON && self->health <= -15)) {
G_Printf("AQ GIB!\n");
self->client->ps.eFlags &= ~EF_HANDCANNON_SMOKED;
self->s.eFlags &= ~EF_KAMIKAZE;
GibEntity (self, killer);
}
// never gib in a nodrop // never gib in a nodrop
if ((self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE) { if ((self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE) {
// gib death // gib death