Merge remote-tracking branch 'origin/master' into zykure/teamscores

diff --combined qcsrc/server/cl_player.qc
index 2b7566298e8cd4a922fa5253fba88d8e40ae3bb6,53a9e7aadc3ddaf97d7480e98f075de0fe3ed0ae..496b0973b41ca4cd0934ddb91935a281cf913544
--- 1/qcsrc/server/cl_player.qc
--- 2/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@@ -274,8 -274,9 +274,9 @@@ void SpawnThrownWeapon (vector org, flo
        }
        else
        {
-               if(W_IsWeaponThrowable(self.weapon))
-                       W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
+               if(WEPSET_CONTAINS_EW(self, self.weapon))
+                       if(W_IsWeaponThrowable(self.weapon))
+                               W_ThrowNewWeapon(self, self.weapon, FALSE, org, randomvec() * 125 + '0 0 200');
        }
  }
  
@@@ -497,7 -498,7 +498,7 @@@ void PlayerDamage (entity inflictor, en
        self.dmg_inflictor = inflictor;
  
        if(g_ca && self != attacker && IS_PLAYER(attacker))
 -              PlayerScore_Add(attacker, SP_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
 +              PlayerTeamScore_Add(attacker, SP_SCORE, ST_SCORE, (damage - excess) * autocvar_g_ca_damage2score_multiplier);
  
        float abot, vbot, awep;
        abot = (IS_BOT_CLIENT(attacker));