Reduced the effect of g_awardpushing 2 significantly. The only differ…

…ence now is that it does not check for solid ground
OpenArena · Dec 18, 2016 · ba479f8 · ba479f8
1 parent 39b71c6
commit ba479f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/code/cgame/cg_event.c b/code/cgame/cg_event.c
@@ -126,7 +126,7 @@ static void CG_Obituary( entityState_t *ent ) {
 		message = NULL;
 		causeShader = cgs.media.skullShader;
 	}
-	else
+	else {
 		switch( mod ) {
 		case MOD_SUICIDE:
 			message = "suicides";
@@ -165,6 +165,7 @@ static void CG_Obituary( entityState_t *ent ) {
 			causeShader = cgs.media.skullShader;
 			break;
 		}
+	}
 
 	if (attacker == target) {
 		gender = ci->gender;
@@ -259,10 +260,10 @@ static void CG_Obituary( entityState_t *ent ) {
 				CG_PlaceString( cg.snap->ps.persistant[PERS_RANK] + 1 ),
 				cg.snap->ps.persistant[PERS_SCORE] );
 		} else {
-                    if(ent->generic1)
-                        s = va("You fragged your ^1TEAMMATE^7 %s", targetName );
-                    else
-			s = va("You fragged %s", targetName );
+			if(ent->generic1)
+				s = va("You fragged your ^1TEAMMATE^7 %s", targetName );
+			else
+				s = va("You fragged %s", targetName );
 		}
 #ifdef MISSIONPACK
 		if (!(cg_singlePlayerActive.integer && cg_cameraOrbit.integer)) {

diff --git a/code/game/g_combat.c b/code/game/g_combat.c
@@ -756,7 +756,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
 	else {
 		if(g_gametype.integer!=GT_LMS && g_gametype.integer != GT_POSSESSION &&
 		        !((g_gametype.integer==GT_ELIMINATION || g_gametype.integer==GT_CTF_ELIMINATION) && level.time < level.roundStartTime)) {
-			if(self->client->ps.persistant[PERS_SCORE]>0 || level.numNonSpectatorClients<3) { //Cannot get negative scores by suicide
+			if(self->client->ps.persistant[PERS_SCORE]>0 || level.numNonSpectatorClients<3) { 
+				//Cannot get negative scores by suicide
 				AddScore( self, self->r.currentOrigin, -1 );
 			}
 		}
@@ -1092,17 +1093,13 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 	}
 
 	if ( (attacker == &g_entities[ENTITYNUM_WORLD] || attacker == targ || attacker->s.eType != ET_PLAYER) && client && client->lastSentFlying>-1 &&
-	        ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT || mod==MOD_SUICIDE || g_awardpushing.integer > 1)) {
+	        ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT || mod==MOD_SUICIDE)) {
 		if( client->lastSentFlyingTime+5000<level.time) {
 			//More than 5 seconds, not a kill!
 			client->lastSentFlying = -1;
 		}
 		else {
 			attacker = &g_entities[client->lastSentFlying];
-			if (! ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT || mod==MOD_SUICIDE) ) {
-				//If non environmental kill then consider it a(n assisted) suicide.
-				mod = MOD_SUICIDE;
-			}
 		}
 	}
 
@@ -1126,9 +1123,6 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
 		damage = damage * max / 100;
 	}
 
-	//Sago: I have moved this up
-	//client = targ->client;
-
 	if ( client ) {
 		if ( client->noclip ) {
 			return;