Merge branch 'master' into Mario/teams_bitflag
authorMario <mario@smbclan.net>
Sun, 10 Jul 2016 08:03:57 +0000 (18:03 +1000)
committerMario <mario@smbclan.net>
Sun, 10 Jul 2016 08:03:57 +0000 (18:03 +1000)
1  2 
qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
qcsrc/server/mutators/mutator/gamemode_ca.qc
qcsrc/server/mutators/mutator/gamemode_ctf.qc
qcsrc/server/mutators/mutator/gamemode_domination.qc
qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
qcsrc/server/mutators/mutator/gamemode_tdm.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;