rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-23 04:01:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

HC gibs almost working :)

Browse source
This commit is contained in:
Richard Allen 2002-05-31 17:32:11 +00:00
parent ac7f82cdd8
commit 91aee071e5
4 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.82 2002/05/31 17:32:11 jbravo
// HC gibs almost working :)
//
// Revision 1.81 2002/05/28 04:46:12 niceass
// headless fix
//
@ -1627,6 +1630,7 @@ void ClientSpawn(gentity_t *ent) {
//Slicer
client->weapon_attempts = 0;
client->weapon_after_bandage_warned = qfalse;
client->gibbed = qfalse;
for ( i = 0 ; i < MAX_PERSISTANT ; i++ ) {
client->ps.persistant[i] = persistant[i];

32
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.86 2002/05/31 17:32:11 jbravo
// HC gibs almost working :)
//
// Revision 1.85 2002/05/30 18:22:20 jbravo
// Misc fixes
//
@ -1140,6 +1143,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
G_FreeEntity(self->client->lasersight);
self->client->lasersight = NULL;
}
// JBravo: clear the gib flag
self->client->gibbed = qfalse;
}
if (self->client->ps.pm_type == PM_DEAD) {
return;
@ -1533,24 +1538,25 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
// NiceAss: beheading =D
self->client->ps.eFlags |= EF_HEADLESS;
GibEntity_Headshot (self, killer);
} else
GibEntity (self, killer);
} else {
self->client->noHead = qfalse;
}
if (meansOfDeath == MOD_SNIPER && hurt == LOC_SDAM)
GibEntity_Stomach (self, killer);
if (meansOfDeath == MOD_HANDCANNON && g_RQ3_gib.integer > 1) { // && self->health <= -15) {
self->client->noHead = qfalse;
trap_LinkEntity (self);
GibEntity (self, killer);
self->client->gibbed = qtrue;
trap_UnlinkEntity (self);
}
} else if (meansOfDeath == MOD_HANDCANNON && g_RQ3_gib.integer > 1 && self->health <= -15) {
self->client->noHead = qfalse;
GibEntity (self, killer);
self->client->gibbed = qtrue;
trap_UnlinkEntity (self);
}
}
// never gib in a nodrop
if (g_RQ3_gib.integer > 0 && ((self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE)) {
if (g_RQ3_gib.integer > 0 && !self->client->gibbed && ((self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE)) {
// gib death
GibEntity( self, killer );
} else if (self->client->gibbed) {
self->client->gibbed = qtrue; // JBravo: Basicly do nothing
} else {
// normal death
static int i;
@ -1580,7 +1586,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
((self->client->ps.torsoAnim & ANIM_TOGGLEBIT) ^ ANIM_TOGGLEBIT) | anim;
// Elder: only do death sounds if not hit in the head
if (level.time - self->client->headShotTime > 400)
if ((level.time - self->client->headShotTime > 400) && !self->client->gibbed)
G_AddEvent( self, EV_DEATH1 + i, killer );
// the body can still be gibbed
@ -1590,6 +1596,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
i = ( i + 1 ) % 3;
}
// JBravo: lets not relink players that have been gibbed here.
if (!self->client->gibbed)
trap_LinkEntity (self);
}
@ -2373,6 +2381,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
targ->client->pers.netname));
trap_SendServerCommand(targ-g_entities, va("print \"Stomach Damage.\n\""));
take *= 0.4;
if (attacker->client && attacker->client->ps.weapon == WP_SSG3000)
G_AddEvent (targ, EV_GIB_PLAYER_STOMACH, 0);
break;
case LOCATION_LEG:
case LOCATION_FOOT:

4
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.85 2002/05/31 17:32:11 jbravo
// HC gibs almost working :)
//
// Revision 1.84 2002/05/30 21:18:28 makro
// Bots should reload/bandage when roaming around
// Added "pathtarget" key to all the entities
@ -597,6 +600,7 @@ struct gclient_s {
int team_wounds_before;
int ff_warning;
int team_kills;
qboolean gibbed;
//Slicer Flood protect:

5
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.100 2002/05/31 17:32:11 jbravo
// HC gibs almost working :)
//
// Revision 1.99 2002/05/31 00:17:06 jbravo
// Slicers fix for the weaponswitching issue
//
@ -1090,7 +1093,7 @@ void MakeSpectator(gentity_t *ent)
gclient_t *client;
client = ent->client;
if (ent->s.eType != ET_INVISIBLE)
if (!client->gibbed || ent->s.eType != ET_INVISIBLE)
CopyToBodyQue (ent);
client->weaponCount[ent->client->ps.weapon] = 0;