X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fteams.qh;h=62bb2db7cdda28a8e6e63da5cf6024e59f570a3e;hb=98ca2b115036d87b8826a13d0f402a96301b7e18;hp=88666db0e836a1b3592987d969eed7b091cfd940;hpb=cbd1a08b104b3e2597eb8482e6a9d5adbcf4c4ab;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh index 88666db0e..62bb2db7c 100644 --- a/qcsrc/common/teams.qh +++ b/qcsrc/common/teams.qh @@ -56,11 +56,11 @@ const string STATIC_NAME_TEAM_3 = "Yellow"; const string STATIC_NAME_TEAM_4 = "Pink"; #ifdef CSQC -float teamplay; -float myteam; +bool teamplay; +int myteam; #endif -string Team_ColorCode(float teamid) +string Team_ColorCode(int teamid) { switch(teamid) { @@ -73,7 +73,7 @@ string Team_ColorCode(float teamid) return "^7"; } -vector Team_ColorRGB(float teamid) +vector Team_ColorRGB(int teamid) { switch(teamid) { @@ -86,7 +86,7 @@ vector Team_ColorRGB(float teamid) return '0 0 0'; } -string Team_ColorName(float teamid) +string Team_ColorName(int teamid) { switch(teamid) { @@ -100,7 +100,7 @@ string Team_ColorName(float teamid) } // used for replacement in filenames or such where the name CANNOT be allowed to be translated -string Static_Team_ColorName(float teamid) +string Static_Team_ColorName(int teamid) { switch(teamid) { @@ -179,11 +179,11 @@ int Team_IndexToTeam(int index) } /// \brief Converts team value into team index. -/// \param[in] team_ Team value to convert. +/// \param[in] team_num Team value to convert. /// \return Team index. -int Team_TeamToIndex(int team_) +int Team_TeamToIndex(int team_num) { - switch (team_) + switch (team_num) { case NUM_TEAM_1: return 1; case NUM_TEAM_2: return 2;