rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor FF system fix

This commit is contained in:
Richard Allen 2003-04-07 12:29:33 +00:00
parent b7305676c9
commit 0cdab1faf5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
reaction/game/g_combat.c
View File

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.136 2003/04/07 12:29:33 jbravo
// Minor FF system fix
//
// Revision 1.135 2003/03/28 10:36:02 jbravo // Revision 1.135 2003/03/28 10:36:02 jbravo
// Tweaking the replacement system a bit. Reactionmale now the default model // Tweaking the replacement system a bit. Reactionmale now the default model
// //
@ -1742,9 +1745,10 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (g_gametype.integer >= GT_TEAM && level.lights_camera_action) { if (g_gametype.integer >= GT_TEAM && level.lights_camera_action) {
return; // JBravo: No dmg during LCA return; // JBravo: No dmg during LCA
} }
// NiceAss: Fixed pointer bug causing DLLs to crash // NiceAss: Fixed pointer bug causing DLLs to crash
// JBravo: FF control // JBravo: FF control
if (targ != attacker && attacker && targ && targ->client && attacker->client) { if (attacker && targ && targ->client && attacker->client && targ != attacker) {
if (g_gametype.integer >= GT_TEAM && targ->client->sess.sessionTeam == attacker->client->sess.sessionTeam) { if (g_gametype.integer >= GT_TEAM && targ->client->sess.sessionTeam == attacker->client->sess.sessionTeam) {
if (g_gametype.integer == GT_TEAMPLAY) { if (g_gametype.integer == GT_TEAMPLAY) {
if (level.team_round_going && g_friendlyFire.integer == 0) if (level.team_round_going && g_friendlyFire.integer == 0)
@ -1775,15 +1779,6 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (!attacker) { if (!attacker) {
attacker = &g_entities[ENTITYNUM_WORLD]; attacker = &g_entities[ENTITYNUM_WORLD];
} }
/* old code
if (targ->s.eType == ET_MOVER && targ->health <= 0) {
//Makro - added
if (targ->use) targ->use(targ, inflictor, attacker);
return;
} */
// Makro - we should change some more stuff in here
// shootable doors / buttons don't actually have any health // shootable doors / buttons don't actually have any health
// Makro - they do now ! // Makro - they do now !
if (targ->s.eType == ET_MOVER) { if (targ->s.eType == ET_MOVER) {
@ -1967,13 +1962,14 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker,
if (g_gametype.integer == GT_TEAMPLAY) { if (g_gametype.integer == GT_TEAMPLAY) {
if (g_friendlyFire.integer == 2 && level.team_round_going) if (g_friendlyFire.integer == 2 && level.team_round_going)
return; return;
if (level.team_round_going)
Add_TeamWound(attacker, targ, mod);
} else if (g_gametype.integer >= GT_TEAM) { } else if (g_gametype.integer >= GT_TEAM) {
if (g_friendlyFire.integer == 2) if (g_friendlyFire.integer == 2)
return; return;
else
Add_TeamWound(attacker, targ, mod);
} }
if ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going)
|| g_gametype.integer >= GT_TEAM)
Add_TeamWound(attacker, targ, mod);
} }
// check for godmode // check for godmode
if (targ->flags & FL_GODMODE) { if (targ->flags & FL_GODMODE) {