Merge branch 'master' into Lyberta/TeamplayOverhaul

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / player.qh

diff --git a/qcsrc/server/player.qh b/qcsrc/server/player.qh
index 5e6642e0471a78220a1af579a705e7b50d74b76b..1c38a9fbebf3012b1d87029e26659457d7548a1c 100644 (file)
--- a/qcsrc/server/player.qh
+++ b/qcsrc/server/player.qh
@@ -30,13 +30,8 @@ void calculate_player_respawn_time(entity this);
 
 void ClientKill_Now_TeamChange(entity this);
 
-/// \brief Moves player to the specified team.
-/// \param[in,out] client Client to move.
-/// \param[in] team_colour Color of the team.
-/// \param[in] type ???
-/// \return True on success, false otherwise.
-bool MoveToTeam(entity client, float team_colour, float type);
-
 void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector force);
 
+bool PlayerHeal(entity targ, entity inflictor, float amount, float limit);
+
 int Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol);