[openjk] 08/14: SP game: Fixed bug introduced in 5c8a2d7

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit d60340bb827318e9717607f82773cb74f9181a3d
Author: Ensiform <ensiform at gmail.com>
Date:   Sat Nov 4 12:13:11 2017 -0500

    SP game: Fixed bug introduced in 5c8a2d7
    
    Rage force power no longer acted like undying due to a typo in this commit
---
 code/game/g_combat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/g_combat.cpp b/code/game/g_combat.cpp
index 2bea305..6378aee 100644
--- a/code/game/g_combat.cpp
+++ b/code/game/g_combat.cpp
@@ -6451,7 +6451,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, const
 		((targ->flags&FL_UNDYING) ||
 			(dflags&DAMAGE_NO_KILL) ||
 			((targ->client) &&
-				(targ->client->ps.forcePowersActive & (1 << FP_RAGE)) &
+				(targ->client->ps.forcePowersActive & (1 << FP_RAGE)) &&
 				!(dflags&DAMAGE_NO_PROTECTION) &&
 				!(dflags&DAMAGE_DIE_ON_IMPACT))));
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git