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

Fixed the plost3 sound in all radiopaks and now damage is only tracked for

Browse source 
players you hit that are not on your team
This commit is contained in:
Richard Allen 2002-08-03 06:52:35 +00:00
parent b4584b00bf
commit ae1cf584c2
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/ChangeLog
View file

@ -19,6 +19,8 @@
* Doors with health and the "wait" key set to a negative value should work as expected now
* MM: Added "resetMatch" for rcon and referee use, to reset the current server Match Stuff
* Fixed the Akimbo ammo when akimbos are not the primary weapon.
* Fixed plost3 radio sounds in all radiopaks.
* Damage is now only tracked for players hit that are not on your team.
# List fixes here for the 2.1 release

14
reaction/cgame/cg_local.h
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.113 2002/08/03 06:52:35 jbravo
// Fixed the plost3 sound in all radiopaks and now damage is only tracked for
// players you hit that are not on your team
//
// Revision 1.112 2002/07/26 22:28:38 jbravo
// Fixed the server about menu, made the UI handle illegal models and skins
// better.
@ -1382,11 +1386,11 @@ typedef struct {
// JBravo: Radio sounds
//Slicer
sfxHandle_t male_sounds[55];
sfxHandle_t new_male_sounds[55];
sfxHandle_t pikey_male_sounds[55];
sfxHandle_t pirate_male_sounds[55];
sfxHandle_t female_sounds[55];
sfxHandle_t male_sounds[56];
sfxHandle_t new_male_sounds[56];
sfxHandle_t pikey_male_sounds[56];
sfxHandle_t pirate_male_sounds[56];
sfxHandle_t female_sounds[56];
sfxHandle_t steamSound;
sfxHandle_t male_1sound;

16
reaction/game/g_combat.c
View file

@ -5,6 +5,10 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.114 2002/08/03 06:52:35 jbravo
// Fixed the plost3 sound in all radiopaks and now damage is only tracked for
// players you hit that are not on your team
//
// Revision 1.113 2002/07/31 19:56:32 makro
// Fixed the code for doors with health and the wait key set to a negative value
//
@ -2313,10 +2317,16 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (take) {
// JBravo: for Damage delt tracking
if (attacker && attacker->client && targ->health > 0) {
if (mod == MOD_TELEFRAG)
if (mod == MOD_TELEFRAG) {
attacker->client->ps.persistant[PERS_DAMAGE_DELT] += 100;
else
attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take;
} else {
if (g_gametype.integer >= GT_TEAM) {
if (attacker->client->sess.sessionTeam != targ->client->sess.sessionTeam)
attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take;
} else {
attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take;
}
}
//Makro - crash bug fix
if (targ && targ->client) {
Com_sprintf(attacker->client->last_damaged_players, sizeof(attacker->client->last_damaged_players),