Merge branch 'master' into terencehill/translate_colors_2

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

diff --git a/qcsrc/server/teamplay.qh b/qcsrc/server/teamplay.qh
index 5664d261daa1a6b26376899369562fe9abc51132..df82a9cae6040e830e077a22bee2f13db963db9d 100644 (file)
--- a/qcsrc/server/teamplay.qh
+++ b/qcsrc/server/teamplay.qh
@@ -1,5 +1,4 @@
-#ifndef TEAMPLAY_H
-#define TEAMPLAY_H
+#pragma once
 
 string cache_mutatormsg;
 string cache_lastmutatormsg;
@@ -17,7 +16,7 @@ void TeamchangeFrags(entity e);
 
 void LogTeamchange(float player_id, float team_number, float type);
 
-void default_delayedinit();
+void default_delayedinit(entity this);
 
 void ActivateTeamplay();
 
@@ -25,7 +24,7 @@ void InitGameplayMode();
 
 string GetClientVersionMessage();
 
-string getwelcomemessage(void);
+string getwelcomemessage();
 
 void SetPlayerColors(entity pl, float _color);
 
@@ -46,10 +45,9 @@ float TeamSmallerEqThanTeam(float ta, float tb, entity e);
 // NOTE: Assumes CheckAllowedTeams has already been called!
 float FindSmallestTeam(entity pl, float ignore_pl);
 
-float JoinBestTeam(entity pl, float only_return_best, float forcebestteam);
+int JoinBestTeam(entity pl, bool only_return_best, bool forcebestteam);
 
 //void() ctf_playerchanged;
 void SV_ChangeTeam(float _color);
 
 void ShufflePlayerOutOfTeam (float source_team);
-#endif