From: Mario <mario@smbclan.net>
Date: Sun, 10 Jul 2016 08:03:57 +0000 (+1000)
Subject: Merge branch 'master' into Mario/teams_bitflag
X-Git-Tag: xonotic-v0.8.2~700^2~10^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=ee7a78f942624de2ab30112a798e3f663cf9cc2f

Merge branch 'master' into Mario/teams_bitflag
---

ee7a78f942624de2ab30112a798e3f663cf9cc2f
diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
index d06c48a44d,07479cc197..1636965e0b
--- a/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
+++ b/qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
@@@ -373,10 -373,10 +373,10 @@@ void GoalTouch(entity this, entity touc
  			return;
  	if((!ball.pusher && this.team != GOAL_OUT) || ball.cnt)
  		return;
- 	EXACTTRIGGER_TOUCH;
+ 	EXACTTRIGGER_TOUCH(this, toucher);
  
  
 -	if(nb_teams == 2)
 +	if(NumTeams(nb_teams) == 2)
  		otherteam = OtherTeam(ball.team);
  	else
  		otherteam = 0;