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

New Obit system and a warning cleanup in zcam

Browse source
This commit is contained in:
Richard Allen 2002-05-09 20:58:30 +00:00
parent 5fd1487131
commit 8c431c132c
5 changed files with 442 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reaction/cgame/cg_event.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.54 2002/05/09 20:58:30 jbravo
// New Obit system and a warning cleanup in zcam
//
// Revision 1.53 2002/05/02 23:04:59 makro // Revision 1.53 2002/05/02 23:04:59 makro
// Loading screen. Jump kicks // Loading screen. Jump kicks
// //
@ -143,6 +146,8 @@ const char *CG_PlaceString( int rank ) {
CG_Obituary CG_Obituary
============= =============
*/ */
// JBravo: moved to game and done right ;)
/*
static void CG_Obituary( entityState_t *ent ) { static void CG_Obituary( entityState_t *ent ) {
int mod, target, attacker; int mod, target, attacker;
int n; //Elder: for random messages int n; //Elder: for random messages
@ -490,6 +495,7 @@ static void CG_Obituary( entityState_t *ent ) {
// we don't know what it was // we don't know what it was
CG_Printf( "(CG_Obituary)%s died and the mod is %i. Tell this to JB\n", targetName, mod ); CG_Printf( "(CG_Obituary)%s died and the mod is %i. Tell this to JB\n", targetName, mod );
} }
*/
/* /*
============= =============
@ -499,6 +505,7 @@ Slim version of main obit
CG_Obituary_Head CG_Obituary_Head
============= =============
*/ */
/*
static void CG_Obituary_Head( entityState_t *ent ) { static void CG_Obituary_Head( entityState_t *ent ) {
int mod, target, attacker; int mod, target, attacker;
char *message, *message2; char *message, *message2;
@ -701,7 +708,7 @@ static void CG_Obituary_Head( entityState_t *ent ) {
// we don't know what it was // we don't know what it was
CG_Printf( "(CG_Obituary_Head)%s died and the mod is %i. Tell this to JB\n", targetName, mod ); CG_Printf( "(CG_Obituary_Head)%s died and the mod is %i. Tell this to JB\n", targetName, mod );
} }
*/
/* /*
============= =============
@ -711,6 +718,7 @@ Slim version of main obit
CG_Obituary_Chest CG_Obituary_Chest
============= =============
*/ */
/*
static void CG_Obituary_Chest( entityState_t *ent ) { static void CG_Obituary_Chest( entityState_t *ent ) {
int mod, target, attacker; int mod, target, attacker;
char *message, *message2; char *message, *message2;
@ -885,7 +893,7 @@ static void CG_Obituary_Chest( entityState_t *ent ) {
// we don't know what it was // we don't know what it was
CG_Printf( "(CG_Obituary_Chest)%s died and the mod is %i. Tell this to JB\n", targetName, mod ); CG_Printf( "(CG_Obituary_Chest)%s died and the mod is %i. Tell this to JB\n", targetName, mod );
} }
*/
/* /*
============= =============
Added by Elder Added by Elder
@ -894,6 +902,7 @@ Slim version of main obit
CG_Obituary_Stomach CG_Obituary_Stomach
============= =============
*/ */
/*
static void CG_Obituary_Stomach( entityState_t *ent ) { static void CG_Obituary_Stomach( entityState_t *ent ) {
int mod, target, attacker; int mod, target, attacker;
char *message, *message2; char *message, *message2;
@ -1079,7 +1088,7 @@ static void CG_Obituary_Stomach( entityState_t *ent ) {
// we don't know what it was // we don't know what it was
CG_Printf( "(CG_Obituary_Stomach)%s died and the mod is %i. Tell this to JB\n", targetName, mod ); CG_Printf( "(CG_Obituary_Stomach)%s died and the mod is %i. Tell this to JB\n", targetName, mod );
} }
*/
/* /*
============= =============
Added by Elder Added by Elder
@ -1088,6 +1097,7 @@ Slim version of main obit
CG_Obituary_Legs CG_Obituary_Legs
============= =============
*/ */
/*
static void CG_Obituary_Legs( entityState_t *ent ) { static void CG_Obituary_Legs( entityState_t *ent ) {
int mod; int mod;
int target, attacker; int target, attacker;
@ -1279,7 +1289,7 @@ static void CG_Obituary_Legs( entityState_t *ent ) {
} }
//========================================================================== //==========================================================================
*/
/* /*
=============== ===============
CG_UseItem CG_UseItem
@ -2469,48 +2479,49 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
case EV_OBITUARY: case EV_OBITUARY:
DEBUGNAME("EV_OBITUARY"); DEBUGNAME("EV_OBITUARY");
CG_Obituary( es ); // JBravo: not used
// CG_Obituary( es );
break; break;
//Elder: location events //Elder: location events
case EV_OBITUARY_HEAD: case EV_OBITUARY_HEAD:
DEBUGNAME("EV_OBITUARY_HEAD"); DEBUGNAME("EV_OBITUARY_HEAD");
// JBravo: the following mod's dont have locations and are not handled in the location Orbits // JBravo: the following mod's dont have locations and are not handled in the location Orbits
if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 || /* if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 ||
es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) { es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) {
CG_Obituary( es ); CG_Obituary( es );
} else { } else {
CG_Obituary_Head( es ); CG_Obituary_Head( es );
} } */
break; break;
case EV_OBITUARY_CHEST: case EV_OBITUARY_CHEST:
DEBUGNAME("EV_OBITUARY_CHEST"); DEBUGNAME("EV_OBITUARY_CHEST");
// JBravo: the following mod's dont have locations and are not handled in the location Orbits // JBravo: the following mod's dont have locations and are not handled in the location Orbits
if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 || /* if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 ||
es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) { es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) {
CG_Obituary( es ); CG_Obituary( es );
} else { } else {
CG_Obituary_Chest( es ); CG_Obituary_Chest( es );
} } */
break; break;
case EV_OBITUARY_STOMACH: case EV_OBITUARY_STOMACH:
DEBUGNAME("EV_OBITUARY_STOMACH"); DEBUGNAME("EV_OBITUARY_STOMACH");
// JBravo: the following mod's dont have locations and are not handled in the location Orbits // JBravo: the following mod's dont have locations and are not handled in the location Orbits
if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 || /* if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 ||
es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) { es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) {
CG_Obituary( es ); CG_Obituary( es );
} else { } else {
CG_Obituary_Stomach( es ); CG_Obituary_Stomach( es );
} } */
break; break;
case EV_OBITUARY_LEGS: case EV_OBITUARY_LEGS:
DEBUGNAME("EV_OBITUARY_LEGS"); DEBUGNAME("EV_OBITUARY_LEGS");
// JBravo: the following mod's dont have locations and are not handled in the location Orbits // JBravo: the following mod's dont have locations and are not handled in the location Orbits
if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 || /* if (es->eventParm == MOD_HANDCANNON || es->eventParm == MOD_M3 ||
es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) { es->eventParm == MOD_KICK || es->eventParm == MOD_GRENADE || es->eventParm == MOD_GRENADE_SPLASH) {
CG_Obituary( es ); CG_Obituary( es );
} else { } else {
CG_Obituary_Legs( es ); CG_Obituary_Legs( es );
} } */
break; break;
// //
// powerup events // powerup events

409
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.67 2002/05/09 20:58:30 jbravo
// New Obit system and a warning cleanup in zcam
//
// Revision 1.66 2002/05/06 00:35:49 jbravo // Revision 1.66 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff // Small fixes to misc stuff
// //
@ -651,6 +654,394 @@ void CheckAlmostScored( gentity_t *self, gentity_t *attacker ) {
} }
} }
/*
==================
SendObit
JBravo: actually send the messages
==================
*/
void SendObit (char *msg, gentity_t *deadguy, gentity_t *attacker) {
int i;
gentity_t *other;
if (g_gametype.integer < GT_TEAM) {
trap_SendServerCommand( -1, va("print \"%s\"", msg));
} else {
if (g_RQ3_printOwnObits.integer == 0) {
for (i = 0; i < level.maxclients; i++) {
other = &g_entities[i];
if (!other->inuse || !other->client)
continue;
if (deadguy != other && level.team_round_going && other->client->sess.sessionTeam != TEAM_SPECTATOR)
continue;
trap_SendServerCommand (other-g_entities, va("print \"%s\"", msg));
}
} else {
for (i = 0; i < level.maxclients; i++) {
other = &g_entities[i];
if (!other->inuse || !other->client)
continue;
if (deadguy != other && other != attacker &&
level.team_round_going && other->client->sess.sessionTeam != TEAM_SPECTATOR)
continue;
trap_SendServerCommand (other-g_entities, va("print \"%s\"", msg));
}
}
}
}
/*
==================
PrintDeathMessage
JBravo: new Obit system
==================
*/
void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, int meansOfDeath) {
int n, gender;
char message[128], message2[128], death_msg[512];
gender = target->client->radioGender;
message[0] = message2[0] = '\0';
switch (meansOfDeath) {
case MOD_SUICIDE:
Q_strncpyz (message, "suicides", sizeof(message));
break;
case MOD_FALLING:
if (gender == GENDER_FEMALE)
Q_strncpyz (message, "plummets to her death", sizeof(message));
else if (gender == GENDER_NEUTER)
Q_strncpyz (message, "plummets to its death", sizeof(message));
else
Q_strncpyz (message, "plummets to his death", sizeof(message));
break;
case MOD_CRUSH:
Q_strncpyz (message, "was flattened", sizeof(message));
break;
case MOD_WATER:
Q_strncpyz (message, "sank like a rock", sizeof(message));
break;
case MOD_SLIME:
Q_strncpyz (message, "melted", sizeof(message));
break;
case MOD_LAVA:
Q_strncpyz (message, "does a back flip into the lava", sizeof(message));
break;
case MOD_TARGET_LASER:
Q_strncpyz (message, "saw the light", sizeof(message));
break;
case MOD_TRIGGER_HURT:
Q_strncpyz (message, "was in the wrong place", sizeof(message));
break;
case MOD_BLEEDING:
Q_strncpyz (message, "bleeds to death", sizeof(message));
break;
default:
message[0] = '\0';
break;
}
if (attacker == target) {
switch (meansOfDeath) {
case MOD_GRENADE_SPLASH:
if (gender == GENDER_FEMALE)
Q_strncpyz (message, "didn't throw her grenade far enough", sizeof(message));
else if (gender == GENDER_NEUTER)
Q_strncpyz (message, "didn't throw its grenade far enough", sizeof(message));
else
Q_strncpyz (message, "didn't throw his grenade far enough", sizeof(message));
break;
case MOD_ROCKET_SPLASH:
if (gender == GENDER_FEMALE)
Q_strncpyz (message, "blew herself up", sizeof(message));
else if (gender == GENDER_NEUTER)
Q_strncpyz (message, "blew itself up", sizeof(message));
else
Q_strncpyz (message, "blew himself up", sizeof(message));
break;
case MOD_PLASMA_SPLASH:
if (gender == GENDER_FEMALE)
Q_strncpyz (message, "melted herself", sizeof(message));
else if (gender == GENDER_NEUTER)
Q_strncpyz (message, "melted itself", sizeof(message));
else
Q_strncpyz (message, "melted himself", sizeof(message));
break;
case MOD_BFG_SPLASH:
Q_strncpyz (message, "should have used a smaller gun", sizeof(message));
break;
default:
if (gender == GENDER_FEMALE)
Q_strncpyz (message, "killed herself", sizeof(message));
else if (gender == GENDER_NEUTER)
Q_strncpyz (message, "killed itself", sizeof(message));
else
Q_strncpyz (message, "killed himself", sizeof(message));
break;
}
}
if (attacker->client || attacker != target)
message[0] = '\0';
if (message[0] != '\0') {
Com_sprintf (death_msg, sizeof(death_msg), "%s %s\n", target->client->pers.netname, message);
SendObit (death_msg, target, attacker);
return;
}
if (attacker->client) {
switch (meansOfDeath) {
case MOD_FALLING:
Q_strncpyz (message, "was taught how to fly by", sizeof(message));
break;
case MOD_PISTOL:
switch (location) {
case LOC_HDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " has a hole in its head from", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " has a hole in her head from", sizeof(message));
else
Q_strncpyz (message, " has a hole in his head from", sizeof(message));
Q_strncpyz (message2, "'s Mark 23 pistol", sizeof(message2));
break;
case LOC_CDAM:
Q_strncpyz (message, " loses a vital chest organ thanks to", sizeof(message));
Q_strncpyz (message2, "'s Mark 23 pistol", sizeof(message2));
break;
case LOC_SDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " loses its lunch to", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " loses her lunch to", sizeof(message));
else
Q_strncpyz (message, " loses his lunch to", sizeof(message));
Q_strncpyz (message2, "'s .45 caliber pistol round", sizeof(message));
break;
case LOC_LDAM:
Q_strncpyz (message, " is legless because of", sizeof(message));
Q_strncpyz (message2, "'s Mark 23 pistol", sizeof(message2));
break;
default:
Q_strncpyz (message, "was shot by", sizeof(message));
Q_strncpyz (message2, "'s Mark 23 Pistol", sizeof(message2));
}
break;
case MOD_MP5:
switch (location) {
case LOC_HDAM:
Q_strncpyz (message, "'s brains are on the wall thanks to", sizeof(message));
Q_strncpyz (message2, "'s 10mm MP5/10 round", sizeof(message));
break;
case LOC_CDAM:
Q_strncpyz (message, " feels some chest pain via", sizeof(message));
Q_strncpyz (message2, "'s MP5/10 Submachinegun", sizeof(message));
break;
case LOC_SDAM:
Q_strncpyz (message, " needs some Pepto Bismol after", sizeof(message));
Q_strncpyz (message2, "'s 10mm MP5 round", sizeof(message2));
break;
case LOC_LDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " had its legs blown off thanks to", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " had her legs blown off thanks to", sizeof(message));
else
Q_strncpyz (message, " had his legs blown off thanks to", sizeof(message));
Q_strncpyz (message2, "'s MP5/10 Submachinegun", sizeof(message2));
break;
default:
Q_strncpyz (message, " was shot by", sizeof(message));
Q_strncpyz (message2, "'s MP5/10 Submachinegun", sizeof(message2));
}
break;
case MOD_M4:
switch (location) {
case LOC_HDAM:
Q_strncpyz (message, " had a makeover by", sizeof(message));
Q_strncpyz (message2, "'s M4 Assault Rifle", sizeof(message2));
break;
case LOC_CDAM:
Q_strncpyz (message, " feels some heart burn thanks to", sizeof(message));
Q_strncpyz (message2, "'s M4 Assault Rifle", sizeof(message2));
break;
case LOC_SDAM:
Q_strncpyz (message, " has an upset stomach thanks to", sizeof(message));
Q_strncpyz (message2, "'s M4 Assault Rifle", sizeof(message2));
break;
case LOC_LDAM:
Q_strncpyz (message, " is now shorter thanks to", sizeof(message));
Q_strncpyz (message2, "'s M4 Assault Rifle", sizeof(message2));
break;
default:
Q_strncpyz (message, " was shot by", sizeof(message));
Q_strncpyz (message2, "'s M4 Assault Rifle", sizeof(message2));
}
break;
case MOD_M3:
n = rand() % 2 + 1;
if (n == 1) {
Q_strncpyz (message, " accepts", sizeof(message));
Q_strncpyz (message2, "'s M3 Super 90 Assault Shotgun in hole-y matrimony", sizeof(message2));
} else {
Q_strncpyz (message, " is full of buckshot from", sizeof(message));
Q_strncpyz (message2, "'s M3 Super 90 Assault Shotgun", sizeof(message2));
}
break;
case MOD_HANDCANNON:
n = rand() % 2 + 1;
if (n == 1) {
Q_strncpyz (message, " ate", sizeof(message));
Q_strncpyz (message2, "'s sawed-off 12 gauge", sizeof(message2));
} else {
Q_strncpyz (message, " is full of buckshot from", sizeof(message));
Q_strncpyz (message2, "'s sawed off shotgun", sizeof(message2));
}
break;
case MOD_SNIPER:
switch (location) {
case LOC_HDAM:
if (RQ3_isZoomed(target)) {
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " saw the sniper bullet go through its scope thanks to", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " saw the sniper bullet go through her scope thanks to", sizeof(message));
else
Q_strncpyz (message, " saw the sniper bullet go through his scope thanks to", sizeof(message));
} else {
Q_strncpyz (message, " caught a sniper bullet between the eyes from", sizeof(message));
}
break;
case LOC_CDAM:
Q_strncpyz (message, " was picked off by", sizeof(message));
break;
case LOC_SDAM:
Q_strncpyz (message, " was sniped in the stomach by", sizeof(message));
break;
case LOC_LDAM:
Q_strncpyz (message, " was shot in the legs by", sizeof(message));
break;
default:
Q_strncpyz (message, " was sniped by", sizeof(message));
}
case MOD_AKIMBO:
switch (location) {
case LOC_HDAM:
Q_strncpyz (message, " was trepanned by", sizeof(message));
Q_strncpyz (message2, "'s akimbo Mark 23 pistols", sizeof(message2));
break;
case LOC_CDAM:
Q_strncpyz (message, " was John Woo'd by", sizeof(message));
break;
case LOC_SDAM:
Q_strncpyz (message, " needs some new kidneys thanks to", sizeof(message));
Q_strncpyz (message2, "'s akimbo Mark 23 pistols", sizeof(message2));
break;
case LOC_LDAM:
Q_strncpyz (message, " was shot in the legs by", sizeof(message));
Q_strncpyz (message2, "'s akimbo Mark 23 pistols", sizeof(message2));
break;
default:
Q_strncpyz (message, " was shot by", sizeof(message));
Q_strncpyz (message2, "'s pair of Mark 23 Pistols", sizeof(message2));
}
break;
case MOD_KNIFE:
switch (location) {
case LOC_HDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " had its throat slit by", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " had her throat slit by", sizeof(message));
else
Q_strncpyz (message, " had his throat slit by", sizeof(message));
break;
case LOC_CDAM:
Q_strncpyz (message, " had open heart surgery, compliments of", sizeof(message));
break;
case LOC_SDAM:
Q_strncpyz (message, " was gutted by", sizeof(message));
break;
case LOC_LDAM:
Q_strncpyz (message, " was stabbed repeatedly in the legs by", sizeof(message));
break;
default:
Q_strncpyz (message, " was slashed apart by", sizeof(message));
Q_strncpyz (message2, "'s Combat Knife", sizeof(message2));
}
break;
case MOD_KNIFE_THROWN:
switch (location) {
case LOC_HDAM:
Q_strncpyz (message, " caught", sizeof(message));
if (gender == GENDER_NEUTER)
Q_strncpyz (message2, "'s flying knife with its forehead", sizeof(message2));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message2, "'s flying knife with her forehead", sizeof(message2));
else
Q_strncpyz (message2, "'s flying knife with his forehead", sizeof(message2));
break;
case LOC_CDAM:
Q_strncpyz (message, "'s ribs don't help against", sizeof(message));
Q_strncpyz (message2, "'s flying knife", sizeof(message2));
break;
case LOC_SDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " sees the contents of its own stomach thanks to", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " sees the contents of her own stomach thanks to", sizeof(message));
else
Q_strncpyz (message, " sees the contents of his own stomach thanks to", sizeof(message));
Q_strncpyz (message2, "'s flying knife", sizeof(message2));
break;
case LOC_LDAM:
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " had its legs cut off thanks to", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " had her legs cut off thanks to", sizeof(message));
else
Q_strncpyz (message, " had his legs cut off thanks to", sizeof(message));
Q_strncpyz (message2, "'s flying knife", sizeof(message2));
break;
default:
Q_strncpyz (message, " was hit by", sizeof(message));
Q_strncpyz (message2, "'s flying Combat Knife", sizeof(message2));
}
break;
case MOD_KICK:
n = rand() % 3 + 1;
if (n == 1) {
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " got its ass kicked by", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " got her ass kicked by", sizeof(message));
else
Q_strncpyz (message, " got his ass kicked by", sizeof(message));
} else if (n == 2) {
Q_strncpyz (message, " couldn't remove", sizeof(message));
if (gender == GENDER_NEUTER)
Q_strncpyz (message2, "'s boot from its ass", sizeof(message2));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message2, "'s boot from her ass", sizeof(message2));
else
Q_strncpyz (message2, "'s boot from his ass", sizeof(message2));
} else {
if (gender == GENDER_NEUTER)
Q_strncpyz (message, " had a Bruce Lee put on it by", sizeof(message));
else if (gender == GENDER_FEMALE)
Q_strncpyz (message, " had a Bruce Lee put on her by", sizeof(message));
else
Q_strncpyz (message, " had a Bruce Lee put on him by", sizeof(message));
Q_strncpyz (message2, ", with a quickness", sizeof(message2));
}
break;
default:
Q_strncpyz (message, " died by some unknown method. TELL THIS TO JB!!!", sizeof(message));
}
Com_sprintf (death_msg, sizeof(death_msg), "%s%s %s%s\n", target->client->pers.netname, message,
attacker->client->pers.netname, message2);
SendObit (death_msg, target, attacker);
}
}
/* /*
================== ==================
player_die player_die
@ -745,6 +1136,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
// broadcast the death event to everyone // broadcast the death event to everyone
// Elder: use appropriate obit event and update statistics tracking // Elder: use appropriate obit event and update statistics tracking
// JBravo: Im redoing the Obits.
if ((self->client->lasthurt_location & LOCATION_HEAD) == LOCATION_HEAD || if ((self->client->lasthurt_location & LOCATION_HEAD) == LOCATION_HEAD ||
(self->client->lasthurt_location & LOCATION_FACE) == LOCATION_FACE) { (self->client->lasthurt_location & LOCATION_FACE) == LOCATION_FACE) {
// head kill // head kill
@ -752,7 +1145,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->client->pers.records[REC_HEADDEATHS]++; self->client->pers.records[REC_HEADDEATHS]++;
if (attacker && attacker->client) attacker->client->pers.records[REC_HEADKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_HEADKILLS]++;
} }
ent = G_TempEntity(self->r.currentOrigin, EV_OBITUARY_HEAD); PrintDeathMessage (self, attacker, LOC_HDAM, meansOfDeath);
} }
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) {
@ -761,7 +1154,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->client->pers.records[REC_CHESTDEATHS]++; self->client->pers.records[REC_CHESTDEATHS]++;
if (attacker && attacker->client) attacker->client->pers.records[REC_CHESTKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_CHESTKILLS]++;
} }
ent = G_TempEntity(self->r.currentOrigin, EV_OBITUARY_CHEST); PrintDeathMessage (self, attacker, LOC_CDAM, meansOfDeath);
} }
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) {
@ -770,7 +1163,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->client->pers.records[REC_STOMACHDEATHS]++; self->client->pers.records[REC_STOMACHDEATHS]++;
if (attacker && attacker->client) attacker->client->pers.records[REC_STOMACHKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_STOMACHKILLS]++;
} }
ent = G_TempEntity(self->r.currentOrigin, EV_OBITUARY_STOMACH); PrintDeathMessage (self, attacker, LOC_SDAM, meansOfDeath);
} }
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) {
@ -779,10 +1172,10 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
self->client->pers.records[REC_LEGDEATHS]++; self->client->pers.records[REC_LEGDEATHS]++;
if (attacker && attacker->client) attacker->client->pers.records[REC_LEGKILLS]++; if (attacker && attacker->client) attacker->client->pers.records[REC_LEGKILLS]++;
} }
ent = G_TempEntity(self->r.currentOrigin, EV_OBITUARY_LEGS); PrintDeathMessage (self, attacker, LOC_LDAM, meansOfDeath);
} else { } else {
// non-location/world kill // // non-location/world kill
ent = G_TempEntity(self->r.currentOrigin, EV_OBITUARY); PrintDeathMessage (self, attacker, LOC_NOLOC, meansOfDeath);
} }
// Elder: Statistics tracking // Elder: Statistics tracking
@ -850,10 +1243,10 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
break; break;
} }
} }
ent->s.eventParm = meansOfDeath; /* ent->s.eventParm = meansOfDeath;
ent->s.otherEntityNum = self->s.number; ent->s.otherEntityNum = self->s.number;
ent->s.otherEntityNum2 = killer; ent->s.otherEntityNum2 = killer;
ent->r.svFlags = SVF_BROADCAST; // send to everyone 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

5
reaction/game/g_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.77 2002/05/09 20:58:30 jbravo
// New Obit system and a warning cleanup in zcam
//
// Revision 1.76 2002/05/05 15:51:16 slicer // Revision 1.76 2002/05/05 15:51:16 slicer
// Captain and subs get saved on map_restarts ( moved to "sess" ) // Captain and subs get saved on map_restarts ( moved to "sess" )
// //
@ -167,6 +170,7 @@
#define BLEED_BANDAGE_TIME 5400 // 27 x 2 #define BLEED_BANDAGE_TIME 5400 // 27 x 2
// types of locations that can be hit // types of locations that can be hit
#define LOC_NOLOC 0 // non-location/world kill
#define LOC_HDAM 1 // head #define LOC_HDAM 1 // head
#define LOC_CDAM 2 // chest #define LOC_CDAM 2 // chest
#define LOC_SDAM 3 // stomach #define LOC_SDAM 3 // stomach
@ -1138,6 +1142,7 @@ extern vmCvar_t g_RQ3_team1model; // JBravo: team 1 model and skin
extern vmCvar_t g_RQ3_team2model; // JBravo: team 2 model and skin extern vmCvar_t g_RQ3_team2model; // JBravo: team 2 model and skin
extern vmCvar_t g_RQ3_tpcountdown; // JBravo: to disable the pregame countdown extern vmCvar_t g_RQ3_tpcountdown; // JBravo: to disable the pregame countdown
extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress extern vmCvar_t g_RQ3_lca; // JBravo: cvar to signal cgame that LCA is in progress
extern vmCvar_t g_RQ3_printOwnObits; // JBravo: cvar to control if attaker sees his own obits.
//extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_teamCount1; // JBravo: cvar for the UI join menus
//extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_teamCount2; // JBravo: cvar for the UI join menus
//extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus //extern vmCvar_t g_RQ3_numSpectators; // JBravo: cvar for the UI join menus

5
reaction/game/g_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.55 2002/05/09 20:58:30 jbravo
// New Obit system and a warning cleanup in zcam
//
// Revision 1.54 2002/05/06 21:41:01 slicer // Revision 1.54 2002/05/06 21:41:01 slicer
// Added rq3_cmd // Added rq3_cmd
// //
@ -228,6 +231,7 @@ vmCvar_t g_RQ3_team2name;
vmCvar_t g_RQ3_team1model; vmCvar_t g_RQ3_team1model;
vmCvar_t g_RQ3_team2model; vmCvar_t g_RQ3_team2model;
vmCvar_t g_RQ3_tpcountdown; vmCvar_t g_RQ3_tpcountdown;
vmCvar_t g_RQ3_printOwnObits;
//vmCvar_t g_RQ3_teamCount1; //vmCvar_t g_RQ3_teamCount1;
//vmCvar_t g_RQ3_teamCount2; //vmCvar_t g_RQ3_teamCount2;
//vmCvar_t g_RQ3_numSpectators; //vmCvar_t g_RQ3_numSpectators;
@ -377,6 +381,7 @@ static cvarTable_t gameCvarTable[] = {
{ &g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SERVERINFO, 0, qfalse }, { &g_RQ3_team1model, "g_RQ3_team1model", "grunt/robber", CVAR_SERVERINFO, 0, qfalse },
{ &g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SERVERINFO, 0, qfalse }, { &g_RQ3_team2model, "g_RQ3_team2model", "grunt/police", CVAR_SERVERINFO, 0, qfalse },
{ &g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 0, qfalse }, { &g_RQ3_tpcountdown, "g_RQ3_tpcountdown", "1", CVAR_ARCHIVE, 0, qfalse },
{ &g_RQ3_printOwnObits, "g_RQ3_printOwnObits", "0", CVAR_ARCHIVE, 0, qfalse },
// { &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_teamCount1, "g_RQ3_teamCount1", "0", CVAR_ROM, 0, qfalse },
// { &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_teamCount2, "g_RQ3_teamCount2", "0", CVAR_ROM, 0, qfalse },
// { &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_ROM, 0, qfalse }, // { &g_RQ3_numSpectators, "g_RQ3_numSpectators", "0", CVAR_ROM, 0, qfalse },

7
reaction/game/zcam.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.13 2002/05/09 20:58:30 jbravo
// New Obit system and a warning cleanup in zcam
//
// Revision 1.12 2002/05/06 00:35:49 jbravo // Revision 1.12 2002/05/06 00:35:49 jbravo
// Small fixes to misc stuff // Small fixes to misc stuff
// //
@ -193,7 +196,8 @@ static float asinf (float x)
static camera_t cameras[MAX_CLIENTS]; static camera_t cameras[MAX_CLIENTS];
/* local functions */ /* local functions */
/*
// JBravo: Not used anymore.
static void CameraShowMode (gentity_t *ent) static void CameraShowMode (gentity_t *ent)
{ {
if (ent->client->camera->mode == CAMERA_MODE_SWING) if (ent->client->camera->mode == CAMERA_MODE_SWING)
@ -203,6 +207,7 @@ static void CameraShowMode (gentity_t *ent)
va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" S_COLOR_MAGENTA "Camera Mode-" S_COLOR_YELLOW"%s\n", va("cp \"\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" S_COLOR_MAGENTA "Camera Mode-" S_COLOR_YELLOW"%s\n",
(ent->client->camera->mode == CAMERA_MODE_FLIC)? "FLIC":"SWING") ); (ent->client->camera->mode == CAMERA_MODE_FLIC)? "FLIC":"SWING") );
} }
*/
static gentity_t *ClosestVisible (gentity_t *ent, float maxrange, qboolean pvs) static gentity_t *ClosestVisible (gentity_t *ent, float maxrange, qboolean pvs)
{ {