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

Elder:

Browse source 
Locational obits plus some Reaction cmd fixes
This commit is contained in:
Victor Chow 2001-06-26 01:58:02 +00:00
parent 35b4492795
commit 3873953762
3 changed files with 921 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reaction/cgame/cg_consolecmds.c
View file

@ -36,6 +36,11 @@ static void CG_DropWeapon_f (void) {
return; return;
} }
// if we are going into the intermission, don't do anything
if ( cg.intermissionStarted ) {
return;
}
///Elder: spectator? ///Elder: spectator?
if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) { if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) {
return; return;
@ -50,7 +55,9 @@ static void CG_DropWeapon_f (void) {
================= =================
CG_Bandage_f CG_Bandage_f
Elder: reset local zoom, then proceed with server action Elder:
check cases that are possible before sending
the client command to reduce bandwidth use slightly
================= =================
*/ */
static void CG_Bandage_f (void) { static void CG_Bandage_f (void) {
@ -58,6 +65,11 @@ static void CG_Bandage_f (void) {
return; return;
} }
// if we are going into the intermission, don't do anything
if ( cg.intermissionStarted ) {
return;
}
//Elder: spectator? //Elder: spectator?
if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) { if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) {
return; return;
@ -69,12 +81,6 @@ static void CG_Bandage_f (void) {
return; return;
} }
//Elder: added to prevent bandaging while reloading or firing
if ( cg.snap->ps.weaponTime > 0 ) {
CG_Printf("You are too busy with your weapon!\n");
return;
}
//if (cg.snap->ps.stats[STAT_BANDAGE]) { //if (cg.snap->ps.stats[STAT_BANDAGE]) {
if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_WORK) == RQ3_BANDAGE_WORK) { if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_WORK) == RQ3_BANDAGE_WORK) {
CG_Printf("You are already bandaging!\n"); CG_Printf("You are already bandaging!\n");
@ -82,6 +88,14 @@ static void CG_Bandage_f (void) {
//cg.zoomLevel = 0; //cg.zoomLevel = 0;
return; return;
} }
//Elder: added to prevent bandaging while reloading or firing
//Moved below "already-bandaging" case and removed message
if ( cg.snap->ps.weaponTime > 0 ) {
//CG_Printf("You are too busy with your weapon!\n");
return;
}
//else if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_NEED) == RQ3_BANDAGE_NEED) { //else if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_NEED) == RQ3_BANDAGE_NEED) {
//cg.zoomed = 0; //cg.zoomed = 0;
//cg.zoomLevel = 0; //cg.zoomLevel = 0;
@ -104,6 +118,11 @@ static void CG_Reload_f (void) {
return; return;
} }
// if we are going into the intermission, don't do anything
if ( cg.intermissionStarted ) {
return;
}
///Elder: spectator? ///Elder: spectator?
if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) { if ( cg.snap->ps.pm_flags & PMF_FOLLOW ) {
return; return;

869
reaction/cgame/cg_event.c
View file

@ -60,6 +60,7 @@ CG_Obituary
*/ */
static void CG_Obituary( entityState_t *ent ) { static void CG_Obituary( entityState_t *ent ) {
int mod; int mod;
int n; //Elder: for random messages
int target, attacker; int target, attacker;
char *message; char *message;
char *message2; char *message2;
@ -102,10 +103,17 @@ static void CG_Obituary( entityState_t *ent ) {
message = "suicides"; message = "suicides";
break; break;
case MOD_FALLING: case MOD_FALLING:
message = "'s thoughts weren't happy enough"; //message = "'s thoughts weren't happy enough";
//Elder: changed
if ( gender == GENDER_FEMALE )
message = "plummets to her death";
else if ( gender == GENDER_NEUTER )
message = "plummets to its death";
else
message = "plummets to his death";
break; break;
case MOD_CRUSH: case MOD_CRUSH:
message = "was squished"; message = "was flattened";
break; break;
case MOD_WATER: case MOD_WATER:
message = "sank like a rock"; message = "sank like a rock";
@ -123,7 +131,7 @@ static void CG_Obituary( entityState_t *ent ) {
message = "was in the wrong place"; message = "was in the wrong place";
break; break;
case MOD_BLEEDING: case MOD_BLEEDING:
message = "bled to death"; message = "bleeds to death";
break; break;
default: default:
message = NULL; message = NULL;
@ -139,6 +147,14 @@ static void CG_Obituary( entityState_t *ent ) {
break; break;
#endif #endif
case MOD_GRENADE_SPLASH: case MOD_GRENADE_SPLASH:
if ( gender == GENDER_FEMALE )
message = "didn't throw her grenade far enough";
else if (gender == GENDER_NEUTER)
message = "didn't throw its grenade far enough";
else
message = "didn't throw his grenade far enough";
break;
/*
if ( gender == GENDER_FEMALE ) if ( gender == GENDER_FEMALE )
message = "tripped on her own grenade"; message = "tripped on her own grenade";
else if ( gender == GENDER_NEUTER ) else if ( gender == GENDER_NEUTER )
@ -146,6 +162,7 @@ static void CG_Obituary( entityState_t *ent ) {
else else
message = "tripped on his own grenade"; message = "tripped on his own grenade";
break; break;
*/
case MOD_ROCKET_SPLASH: case MOD_ROCKET_SPLASH:
if ( gender == GENDER_FEMALE ) if ( gender == GENDER_FEMALE )
message = "blew herself up"; message = "blew herself up";
@ -296,7 +313,246 @@ static void CG_Obituary( entityState_t *ent ) {
message = "was juiced by"; message = "was juiced by";
break; break;
#endif #endif
//Elder: added
case MOD_FALLING:
message = "was taught how to fly by";
break;
case MOD_PISTOL: case MOD_PISTOL:
message = "was shot by";
message2 = "'s Mark 23 Pistol";
break;
case MOD_M4:
message = "was shot by";
message2 = "'s M4 Assault Rifle";
break;
case MOD_MP5:
message = "was shot by";
message2 = "'s MP5/10 Submachinegun";
break;
case MOD_AKIMBO:
message = "was shot by";
message2 = "'s pair of Mark 23 Pistols";
break;
case MOD_M3:
n = rand() % 2 + 1;
if (n == 1)
{
message = "accepts";
message2 = "'s M3 Super 90 Assault Shotgun in hole-y matrimony";
}
else
{
message = "is full of buckshot from";
message2 = "'s M3 Super 90 Assault Shotgun";
}
break;
case MOD_HANDCANNON:
n = rand() % 2 + 1;
if (n == 1)
{
message = "ate";
message2 = "'s sawed-off 12 gauge";
}
else
{
message = "is full of buckshot from";
message2 = "'s sawed off shotgun";
}
break;
case MOD_SNIPER:
message = "was sniped by";
break;
case MOD_KICK:
n = rand() % 3 + 1;
if (n == 1)
{
if (gender == GENDER_NEUTER)
message = "got its ass kicked by";
else if (gender == GENDER_FEMALE)
message = "got her ass kicked by";
else
message = "got his ass kicked by";
}
else if (n == 2)
{
message = "couldn't remove";
if (gender == GENDER_NEUTER)
message2 = "'s boot from its ass";
else if (gender == GENDER_FEMALE)
message2 = "'s boot from her ass";
else
message2 = "'s boot from his ass";
}
else
{
if (gender == GENDER_NEUTER)
message = "had a Bruce Lee put on it by";
else if (gender == GENDER_FEMALE)
message = "had a Bruce Lee put on her by";
else
message = "had a Bruce Lee put on him by";
message2 = ", with a quickness";
}
break;
case MOD_KNIFE:
message = "was slashed apart by";
message2 = "'s Combat Knife";
break;
case MOD_KNIFE_THROWN:
message = " was hit by";
message2 = "'s flying Combat Knife";
break;
case MOD_TELEFRAG:
message = "tried to invade";
message2 = "'s personal space";
break;
default:
message = "was killed by";
break;
}
if (message) {
CG_Printf( "%s %s %s%s\n",
targetName, message, attackerName, message2);
return;
}
}
// we don't know what it was
CG_Printf( "%s died.\n", targetName );
}
/*
=============
Added by Elder
Slim version of main obit
CG_Obituary_Head
=============
*/
static void CG_Obituary_Head( entityState_t *ent ) {
int mod;
int target, attacker;
char *message;
char *message2;
const char *targetInfo;
const char *attackerInfo;
char targetName[32];
char attackerName[32];
gender_t gender;
clientInfo_t *ci;
target = ent->otherEntityNum;
attacker = ent->otherEntityNum2;
mod = ent->eventParm;
if ( target < 0 || target >= MAX_CLIENTS ) {
CG_Error( "CG_Obituary: target out of range" );
}
ci = &cgs.clientinfo[target];
if ( attacker < 0 || attacker >= MAX_CLIENTS ) {
attacker = ENTITYNUM_WORLD;
attackerInfo = NULL;
} else {
attackerInfo = CG_ConfigString( CS_PLAYERS + attacker );
}
targetInfo = CG_ConfigString( CS_PLAYERS + target );
if ( !targetInfo ) {
return;
}
Q_strncpyz( targetName, Info_ValueForKey( targetInfo, "n" ), sizeof(targetName) - 2);
strcat( targetName, S_COLOR_WHITE );
message2 = "";
// check for single client messages
switch( mod ) {
case MOD_SUICIDE:
message = "suicides";
break;
case MOD_FALLING:
message = "'s thoughts weren't happy enough";
break;
case MOD_CRUSH:
message = "was squished";
break;
case MOD_WATER:
message = "sank like a rock";
break;
case MOD_SLIME:
message = "melted";
break;
case MOD_LAVA:
message = "does a back flip into the lava";
break;
case MOD_TARGET_LASER:
message = "saw the light";
break;
case MOD_TRIGGER_HURT:
message = "was in the wrong place";
break;
case MOD_BLEEDING:
message = "bled to death";
break;
default:
message = NULL;
break;
}
if (attacker == target) {
gender = ci->gender;
switch (mod) {
case MOD_GRENADE_SPLASH:
break;
default:
//Elder: shouldn't be here
break;
}
}
if (message) {
CG_Printf( "%s %s.\n", targetName, message);
return;
}
// check for kill messages from the current clientNum
if ( attacker == cg.snap->ps.clientNum ) {
char *s;
if ( cgs.gametype < GT_TEAM ) {
s = va("You fragged %s\n%s place with %i", targetName,
CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
cg.snap->ps.persistant[PERS_SCORE] );
} else {
s = va("You fragged %s", targetName );
}
// print the text message as well
}
// check for double client messages
if ( !attackerInfo ) {
attacker = ENTITYNUM_WORLD;
strcpy( attackerName, "noname" );
} else {
Q_strncpyz( attackerName, Info_ValueForKey( attackerInfo, "n" ), sizeof(attackerName) - 2);
strcat( attackerName, S_COLOR_WHITE );
// check for kill messages about the current clientNum
if ( target == cg.snap->ps.clientNum ) {
Q_strncpyz( cg.killerName, attackerName, sizeof( cg.killerName ) );
}
}
if ( attacker != ENTITYNUM_WORLD ) {
switch (mod) {
case MOD_PISTOL:
if (gender == GENDER_FEMALE)
message = "has a hole in her head from";
else if (gender == GENDER_NEUTER)
message = "has a hole in its head from";
else
message = "has a hole in his head from"; message = "has a hole in his head from";
message2 = "'s Mark23 Pistol"; message2 = "'s Mark23 Pistol";
break; break;
@ -312,19 +568,596 @@ static void CG_Obituary( entityState_t *ent ) {
message = "was trepanned by"; message = "was trepanned by";
message2 = "'s akimbo Mark 23 pistols"; message2 = "'s akimbo Mark 23 pistols";
break; break;
case MOD_M3: case MOD_SNIPER:
message = "accepts"; if (cg.refdef.fov_x < 90)
message2 = "'s M3 Super 90 Assault Shotgun in hole-y matrimony"; {
if (gender == GENDER_NEUTER)
message = "saw the sniper bullet go through its scope thanks to";
else if (gender == GENDER_FEMALE)
message = "saw the sniper bullet go through her scope thanks to";
else
message = "saw the sniper bullet go through his scope thanks to";
}
else
{
message = "caught a sniper bullet between the eyes from";
}
break;
case MOD_KNIFE:
if (gender == GENDER_NEUTER)
message = "had its throat slit by";
else if (gender == GENDER_FEMALE)
message = "had her throat slit by";
else
message = "had his throat slit by";
break;
case MOD_KNIFE_THROWN:
message = "caught";
if (gender == GENDER_NEUTER)
message2 = "'s flying knife with its forehead";
else if (gender == GENDER_FEMALE)
message2 = "'s flying knife with her forehead";
else
message2 = "'s flying knife with his forehead";
break; break;
case MOD_HANDCANNON: case MOD_HANDCANNON:
message = "ate"; case MOD_M3:
message2 = "'s sawed-off 12 gauge"; case MOD_KICK:
case MOD_GRENADE:
case MOD_GRENADE_SPLASH:
//Elder: shouldn't be here
break;
case MOD_TELEFRAG:
message = "tried to invade";
message2 = "'s personal space";
break;
default:
message = "was killed by";
break;
}
if (message) {
CG_Printf( "%s %s %s%s\n",
targetName, message, attackerName, message2);
return;
}
}
// we don't know what it was
CG_Printf( "%s died.\n", targetName );
}
/*
=============
Added by Elder
Slim version of main obit
CG_Obituary_Chest
=============
*/
static void CG_Obituary_Chest( entityState_t *ent ) {
int mod;
int target, attacker;
char *message;
char *message2;
const char *targetInfo;
const char *attackerInfo;
char targetName[32];
char attackerName[32];
gender_t gender;
clientInfo_t *ci;
target = ent->otherEntityNum;
attacker = ent->otherEntityNum2;
mod = ent->eventParm;
if ( target < 0 || target >= MAX_CLIENTS ) {
CG_Error( "CG_Obituary: target out of range" );
}
ci = &cgs.clientinfo[target];
if ( attacker < 0 || attacker >= MAX_CLIENTS ) {
attacker = ENTITYNUM_WORLD;
attackerInfo = NULL;
} else {
attackerInfo = CG_ConfigString( CS_PLAYERS + attacker );
}
targetInfo = CG_ConfigString( CS_PLAYERS + target );
if ( !targetInfo ) {
return;
}
Q_strncpyz( targetName, Info_ValueForKey( targetInfo, "n" ), sizeof(targetName) - 2);
strcat( targetName, S_COLOR_WHITE );
message2 = "";
// check for single client messages
switch( mod ) {
case MOD_SUICIDE:
message = "suicides";
break;
case MOD_FALLING:
message = "'s thoughts weren't happy enough";
break;
case MOD_CRUSH:
message = "was squished";
break;
case MOD_WATER:
message = "sank like a rock";
break;
case MOD_SLIME:
message = "melted";
break;
case MOD_LAVA:
message = "does a back flip into the lava";
break;
case MOD_TARGET_LASER:
message = "saw the light";
break;
case MOD_TRIGGER_HURT:
message = "was in the wrong place";
break;
case MOD_BLEEDING:
message = "bled to death";
break;
default:
message = NULL;
break;
}
if (attacker == target) {
gender = ci->gender;
switch (mod) {
case MOD_GRENADE_SPLASH:
default:
//Elder: shouldn't be here
break;
}
}
if (message) {
CG_Printf( "%s %s.\n", targetName, message);
return;
}
// check for kill messages from the current clientNum
if ( attacker == cg.snap->ps.clientNum ) {
char *s;
if ( cgs.gametype < GT_TEAM ) {
s = va("You fragged %s\n%s place with %i", targetName,
CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
cg.snap->ps.persistant[PERS_SCORE] );
} else {
s = va("You fragged %s", targetName );
}
// print the text message as well
}
// check for double client messages
if ( !attackerInfo ) {
attacker = ENTITYNUM_WORLD;
strcpy( attackerName, "noname" );
} else {
Q_strncpyz( attackerName, Info_ValueForKey( attackerInfo, "n" ), sizeof(attackerName) - 2);
strcat( attackerName, S_COLOR_WHITE );
// check for kill messages about the current clientNum
if ( target == cg.snap->ps.clientNum ) {
Q_strncpyz( cg.killerName, attackerName, sizeof( cg.killerName ) );
}
}
if ( attacker != ENTITYNUM_WORLD ) {
switch (mod) {
case MOD_PISTOL:
message = "loses a vital chest organ thanks to";
message2 = "'s Mark 23 pistol";
break;
case MOD_M4:
message = "feels some heart burn thanks to";
message2 = "'s M4 Assault Rifle";
break;
case MOD_MP5:
message = "feels some chest pain via";
message2 = "'s MP5/10 Submachinegun";
break;
case MOD_AKIMBO:
message = "was John Woo'd by";
break; break;
case MOD_SNIPER: case MOD_SNIPER:
message = "was picked off by"; message = "was picked off by";
break; break;
case MOD_KNIFE:
message = "had open heart surgery, compliments of";
break;
case MOD_KNIFE_THROWN:
message = "'s ribs don't help against";
message2 = "'s flying knife";
break;
case MOD_HANDCANNON:
case MOD_M3:
case MOD_KICK: case MOD_KICK:
message = "got his ass kicked by"; case MOD_GRENADE:
case MOD_GRENADE_SPLASH:
//Elder: shouldn't be here
break;
case MOD_TELEFRAG:
message = "tried to invade";
message2 = "'s personal space";
break;
default:
message = "was killed by";
break;
}
if (message) {
CG_Printf( "%s %s %s%s\n",
targetName, message, attackerName, message2);
return;
}
}
// we don't know what it was
CG_Printf( "%s died.\n", targetName );
}
/*
=============
Added by Elder
Slim version of main obit
CG_Obituary_Stomach
=============
*/
static void CG_Obituary_Stomach( entityState_t *ent ) {
int mod;
int target, attacker;
char *message;
char *message2;
const char *targetInfo;
const char *attackerInfo;
char targetName[32];
char attackerName[32];
gender_t gender;
clientInfo_t *ci;
target = ent->otherEntityNum;
attacker = ent->otherEntityNum2;
mod = ent->eventParm;
if ( target < 0 || target >= MAX_CLIENTS ) {
CG_Error( "CG_Obituary: target out of range" );
}
ci = &cgs.clientinfo[target];
if ( attacker < 0 || attacker >= MAX_CLIENTS ) {
attacker = ENTITYNUM_WORLD;
attackerInfo = NULL;
} else {
attackerInfo = CG_ConfigString( CS_PLAYERS + attacker );
}
targetInfo = CG_ConfigString( CS_PLAYERS + target );
if ( !targetInfo ) {
return;
}
Q_strncpyz( targetName, Info_ValueForKey( targetInfo, "n" ), sizeof(targetName) - 2);
strcat( targetName, S_COLOR_WHITE );
message2 = "";
// check for single client messages
switch( mod ) {
case MOD_SUICIDE:
message = "suicides";
break;
case MOD_FALLING:
message = "'s thoughts weren't happy enough";
break;
case MOD_CRUSH:
message = "was squished";
break;
case MOD_WATER:
message = "sank like a rock";
break;
case MOD_SLIME:
message = "melted";
break;
case MOD_LAVA:
message = "does a back flip into the lava";
break;
case MOD_TARGET_LASER:
message = "saw the light";
break;
case MOD_TRIGGER_HURT:
message = "was in the wrong place";
break;
case MOD_BLEEDING:
message = "bled to death";
break;
default:
message = NULL;
break;
}
if (attacker == target) {
gender = ci->gender;
switch (mod) {
case MOD_GRENADE_SPLASH:
default:
//Elder: shouldn't be here
break;
}
}
if (message) {
CG_Printf( "%s %s.\n", targetName, message);
return;
}
// check for kill messages from the current clientNum
if ( attacker == cg.snap->ps.clientNum ) {
char *s;
if ( cgs.gametype < GT_TEAM ) {
s = va("You fragged %s\n%s place with %i", targetName,
CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
cg.snap->ps.persistant[PERS_SCORE] );
} else {
s = va("You fragged %s", targetName );
}
// print the text message as well
}
// check for double client messages
if ( !attackerInfo ) {
attacker = ENTITYNUM_WORLD;
strcpy( attackerName, "noname" );
} else {
Q_strncpyz( attackerName, Info_ValueForKey( attackerInfo, "n" ), sizeof(attackerName) - 2);
strcat( attackerName, S_COLOR_WHITE );
// check for kill messages about the current clientNum
if ( target == cg.snap->ps.clientNum ) {
Q_strncpyz( cg.killerName, attackerName, sizeof( cg.killerName ) );
}
}
if ( attacker != ENTITYNUM_WORLD ) {
switch (mod) {
case MOD_PISTOL:
if (gender == GENDER_NEUTER)
message = "loses its lunch to";
else if (gender == GENDER_FEMALE)
message = "loses her lunch to";
else
message = "loses his lunch to";
message2 = "'s .45 caliber pistol round";
break;
case MOD_M4:
message = "has an upset stomach thanks to";
message2 = "'s M4 Assault Rifle";
break;
case MOD_MP5:
message = "needs some Pepto Bismol after";
message2 = "'s 10mm MP5 round";
break;
case MOD_AKIMBO:
message = "needs some new kidneys thanks to";
message2 = "'s akimbo Mark 23 pistols";
break;
case MOD_SNIPER:
message = "was sniped in the stomach by";
break;
case MOD_KNIFE:
message = "was gutted by";
break;
case MOD_KNIFE_THROWN:
if (gender == GENDER_NEUTER)
message = "sees the contents of its own stomach thanks to";
else if (gender == GENDER_FEMALE)
message = "sees the contents of her own stomach thanks to";
else
message = "sees the contents of his own stomach thanks to";
message2 = "'s flying knife";
break;
case MOD_HANDCANNON:
case MOD_M3:
case MOD_KICK:
case MOD_GRENADE:
case MOD_GRENADE_SPLASH:
//Elder: shouldn't be here
break;
case MOD_TELEFRAG:
message = "tried to invade";
message2 = "'s personal space";
break;
default:
message = "was killed by";
break;
}
if (message) {
CG_Printf( "%s %s %s%s\n",
targetName, message, attackerName, message2);
return;
}
}
// we don't know what it was
CG_Printf( "%s died.\n", targetName );
}
/*
=============
Added by Elder
Slim version of main obit
CG_Obituary_Legs
=============
*/
static void CG_Obituary_Legs( entityState_t *ent ) {
int mod;
int target, attacker;
char *message;
char *message2;
const char *targetInfo;
const char *attackerInfo;
char targetName[32];
char attackerName[32];
gender_t gender;
clientInfo_t *ci;
target = ent->otherEntityNum;
attacker = ent->otherEntityNum2;
mod = ent->eventParm;
if ( target < 0 || target >= MAX_CLIENTS ) {
CG_Error( "CG_Obituary: target out of range" );
}
ci = &cgs.clientinfo[target];
if ( attacker < 0 || attacker >= MAX_CLIENTS ) {
attacker = ENTITYNUM_WORLD;
attackerInfo = NULL;
} else {
attackerInfo = CG_ConfigString( CS_PLAYERS + attacker );
}
targetInfo = CG_ConfigString( CS_PLAYERS + target );
if ( !targetInfo ) {
return;
}
Q_strncpyz( targetName, Info_ValueForKey( targetInfo, "n" ), sizeof(targetName) - 2);
strcat( targetName, S_COLOR_WHITE );
message2 = "";
// check for single client messages
switch( mod ) {
case MOD_SUICIDE:
message = "suicides";
break;
case MOD_FALLING:
message = "'s thoughts weren't happy enough";
break;
case MOD_CRUSH:
message = "was squished";
break;
case MOD_WATER:
message = "sank like a rock";
break;
case MOD_SLIME:
message = "melted";
break;
case MOD_LAVA:
message = "does a back flip into the lava";
break;
case MOD_TARGET_LASER:
message = "saw the light";
break;
case MOD_TRIGGER_HURT:
message = "was in the wrong place";
break;
case MOD_BLEEDING:
message = "bled to death";
break;
default:
message = NULL;
break;
}
if (attacker == target) {
gender = ci->gender;
switch (mod) {
case MOD_GRENADE_SPLASH:
default:
//Elder: shouldn't be here
break;
}
}
if (message) {
CG_Printf( "%s %s.\n", targetName, message);
return;
}
// check for kill messages from the current clientNum
if ( attacker == cg.snap->ps.clientNum ) {
char *s;
if ( cgs.gametype < GT_TEAM ) {
s = va("You fragged %s\n%s place with %i", targetName,
CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
cg.snap->ps.persistant[PERS_SCORE] );
} else {
s = va("You fragged %s", targetName );
}
// print the text message as well
}
// check for double client messages
if ( !attackerInfo ) {
attacker = ENTITYNUM_WORLD;
strcpy( attackerName, "noname" );
} else {
Q_strncpyz( attackerName, Info_ValueForKey( attackerInfo, "n" ), sizeof(attackerName) - 2);
strcat( attackerName, S_COLOR_WHITE );
// check for kill messages about the current clientNum
if ( target == cg.snap->ps.clientNum ) {
Q_strncpyz( cg.killerName, attackerName, sizeof( cg.killerName ) );
}
}
if ( attacker != ENTITYNUM_WORLD ) {
switch (mod) {
case MOD_PISTOL:
message = "is legless because of";
message2 = "'s .45 caliber pistol round";
break;
case MOD_M4:
message = "is now shorter thanks to";
message2 = "'s M4 Assault Rifle";
break;
case MOD_MP5:
if (gender == GENDER_NEUTER)
message = "had its legs blown off thanks to";
else if (gender == GENDER_FEMALE)
message = "had her legs blown off thanks to";
else
message = "had his legs blown off thanks to";
message2 = "'s MP5/10 Submachinegun";
break;
case MOD_AKIMBO:
message = "was shot in the legs by";
message2 = "'s akimbo Mark 23 pistols";
break;
case MOD_SNIPER:
message = "was shot in the legs by";
break;
case MOD_KNIFE:
message = "was stabbed repeatedly in the legs by";
break;
case MOD_KNIFE_THROWN:
if (gender == GENDER_NEUTER)
message = "had its legs cut off thanks to";
else if (gender == GENDER_FEMALE)
message = "had her legs cut off thanks to";
else
message = "had his legs cut off thanks to";
message2 = "'s flying knife";
break;
case MOD_HANDCANNON:
case MOD_M3:
case MOD_KICK:
case MOD_GRENADE:
case MOD_GRENADE_SPLASH:
//Elder: shouldn't be here
break; break;
case MOD_TELEFRAG: case MOD_TELEFRAG:
message = "tried to invade"; message = "tried to invade";
@ -1235,7 +2068,23 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
DEBUGNAME("EV_OBITUARY"); DEBUGNAME("EV_OBITUARY");
CG_Obituary( es ); CG_Obituary( es );
break; break;
//Elder: location events
case EV_OBITUARY_HEAD:
DEBUGNAME("EV_OBITUARY_HEAD");
CG_Obituary_Head( es );
break;
case EV_OBITUARY_CHEST:
DEBUGNAME("EV_OBITUARY_CHEST");
CG_Obituary_Chest( es );
break;
case EV_OBITUARY_STOMACH:
DEBUGNAME("EV_OBITUARY_STOMACH");
CG_Obituary_Stomach( es );
break;
case EV_OBITUARY_LEGS:
DEBUGNAME("EV_OBITUARY_LEGS");
CG_Obituary_Legs( es );
break;
// //
// powerup events // powerup events
// //

35
reaction/cgame/cg_weapons.c
View file

@ -1762,6 +1762,11 @@ void CG_Weapon_f( void ) {
return; return;
} }
// if we are going into the intermission, don't do anything
if ( cg.intermissionStarted ) {
return;
}
//Elder: added to prevent weapon switching while bandaging //Elder: added to prevent weapon switching while bandaging
if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_WORK) == RQ3_BANDAGE_WORK) { if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_WORK) == RQ3_BANDAGE_WORK) {
CG_Printf("You are too busy bandaging...\n"); CG_Printf("You are too busy bandaging...\n");
@ -1830,6 +1835,16 @@ The current weapon has just run out of ammo
void CG_OutOfAmmoChange( void ) { void CG_OutOfAmmoChange( void ) {
int i; int i;
if (!cg.snap)
return;
//Select the pistol when we run out of grenades or knives
if (cg.snap->ps.weapon == WP_KNIFE || cg.snap->ps.weapon == WP_GRENADE) {
cg.weaponSelectTime = cg.time;
cg.weaponSelect = WP_PISTOL;
}
/* Elder: disable auto-switch /* Elder: disable auto-switch
cg.weaponSelectTime = cg.time; cg.weaponSelectTime = cg.time;
@ -2274,9 +2289,12 @@ SHOTGUN TRACING
/* /*
================ ================
CG_ShotgunPellet CG_ShotgunPellet
Elder: added shellWeapon param
We are not going to show every HC impact
================ ================
*/ */
static void CG_ShotgunPellet( vec3_t start, vec3_t end, int skipNum ) { static void CG_ShotgunPellet( vec3_t start, vec3_t end, int skipNum, int shellWeapon ) {
trace_t tr; trace_t tr;
int sourceContentType, destContentType; int sourceContentType, destContentType;
@ -2316,10 +2334,21 @@ static void CG_ShotgunPellet( vec3_t start, vec3_t end, int skipNum ) {
} }
if ( tr.surfaceFlags & SURF_METALSTEPS ) { if ( tr.surfaceFlags & SURF_METALSTEPS ) {
//Blaze: Changed WP_SHOTGUN to WP_M3 //Blaze: Changed WP_SHOTGUN to WP_M3
if (shellWeapon == WP_M3)
CG_MissileHitWall( WP_M3, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_METAL ); CG_MissileHitWall( WP_M3, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_METAL );
else if (shellWeapon == WP_HANDCANNON && crandom() > 0.5) {
//Elder: show only approximately every other impact mark
CG_MissileHitWall( WP_HANDCANNON, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_METAL );
}
} else { } else {
//Blaze: Changed WP_SHOTGUN to WP_M3 //Blaze: Changed WP_SHOTGUN to WP_M3
if (shellWeapon == WP_M3)
CG_MissileHitWall( WP_M3, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_DEFAULT ); CG_MissileHitWall( WP_M3, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_DEFAULT );
else if (shellWeapon == WP_HANDCANNON && crandom() > 0.5) {
//Elder: show only approximately every other impact mark
CG_MissileHitWall( WP_HANDCANNON, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_DEFAULT );
}
//CG_MissileHitWall( WP_M3, 0, tr.endpos, tr.plane.normal, IMPACTSOUND_DEFAULT );
} }
} }
} }
@ -2372,6 +2401,8 @@ static void CG_ShotgunPattern( vec3_t origin, vec3_t origin2, int otherEntNum, i
} }
else else
{ {
//Elder: fill in shotType
shotType = WP_HANDCANNON;
r = crandom() * DEFAULT_SHOTGUN_HSPREAD * 16 * 4; r = crandom() * DEFAULT_SHOTGUN_HSPREAD * 16 * 4;
u = crandom() * DEFAULT_SHOTGUN_VSPREAD * 16 * hc_multipler; u = crandom() * DEFAULT_SHOTGUN_VSPREAD * 16 * hc_multipler;
// r = crandom() * DEFAULT_HANDCANNON_SPREAD * 16 * 4; // r = crandom() * DEFAULT_HANDCANNON_SPREAD * 16 * 4;
@ -2380,7 +2411,7 @@ static void CG_ShotgunPattern( vec3_t origin, vec3_t origin2, int otherEntNum, i
VectorMA (end, r, right, end); VectorMA (end, r, right, end);
VectorMA (end, u, up, end); VectorMA (end, u, up, end);
CG_ShotgunPellet( origin, end, otherEntNum ); CG_ShotgunPellet( origin, end, otherEntNum, shotType );
} }
} }