From: Erik Schilling <ablu.erikschilling@googlemail.com>
Date: Fri, 14 Jun 2013 18:51:14 +0000 (+0200)
Subject: Fixed infinite strength in vehicle
X-Git-Tag: xonotic-v0.8.0~388^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf4f14fd238b2c18c077e43b005979f36bad5e61;p=xonotic%2Fxonotic-data.pk3dir.git

Fixed infinite strength in vehicle

Fixes: #1322.
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 036bb45fb..c687c4502 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1418,7 +1418,7 @@ void player_powerups (void)
 
 	self.effects &~= (EF_RED | EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT | EF_FLAME | EF_NODEPTHTEST);
 
-	if(self.alpha < 0 || self.deadflag) // don't apply the flags if the player is gibbed
+	if((self.alpha < 0 || self.deadflag) && !self.vehicle) // don't apply the flags if the player is gibbed
 		return;
 
 	Fire_ApplyDamage(self);