Merge branch 'master' into terencehill/bot_ai
authorterencehill <piuntn@gmail.com>
Tue, 21 Aug 2018 11:52:30 +0000 (13:52 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 21 Aug 2018 11:52:30 +0000 (13:52 +0200)
# Conflicts:
# .gitlab-ci.yml
# qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc

1  2 
qcsrc/common/gamemodes/gamemode/ctf/ctf.qc
qcsrc/common/gamemodes/gamemode/domination/domination.qc
qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qc
qcsrc/common/gamemodes/gamemode/keepaway/keepaway.qc
qcsrc/server/bot/default/bot.qc

@@@ -164,15 -176,8 +176,8 @@@ void ka_DropEvent(entity plyr) // runs 
        ball.effects &= ~EF_NODRAW;
        setorigin(ball, plyr.origin + '0 0 10');
        ball.velocity = '0 0 200' + '0 100 0'*crandom() + '100 0 0'*crandom();
-       entity e = ball.owner;
        ball.owner = NULL;
-       e.ballcarried = NULL;
-       GameRules_scoring_vip(e, false);
-       navigation_dynamicgoal_set(ball, e);
-       // reset the player effects
-       plyr.glow_trail = false;
-       plyr.effects &= ~autocvar_g_keepaway_ballcarrier_effects;
 -      navigation_dynamicgoal_set(ball);
++      navigation_dynamicgoal_set(ball, plyr);
  
        // messages and sounds
        ka_EventLog("dropped", plyr);
Simple merge