X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fteams.qh;h=074835d5e79c4914807f79ed60ab51137525c3f4;hb=c11cbc96e9310e51bdcbf0f7e04f22bd4bd0d511;hp=069904290b7d45361bdb7a1828ead5888bc3bca2;hpb=d83e03a366494037c020f4cebf474325de88e69e;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/teams.qh b/qcsrc/common/teams.qh index 069904290..074835d5e 100644 --- a/qcsrc/common/teams.qh +++ b/qcsrc/common/teams.qh @@ -1,22 +1,25 @@ +#ifndef TEAMS_H +#define TEAMS_H + #ifdef TEAMNUMBERS_THAT_ARENT_STUPID -const float NUM_TEAM_1 = 1; // red -const float NUM_TEAM_2 = 2; // blue -const float NUM_TEAM_3 = 3; // yellow -const float NUM_TEAM_4 = 4; // pink -const float NUM_SPECTATOR = 5; +const int NUM_TEAM_1 = 1; // red +const int NUM_TEAM_2 = 2; // blue +const int NUM_TEAM_3 = 3; // yellow +const int NUM_TEAM_4 = 4; // pink +const int NUM_SPECTATOR = 5; #else #ifdef CSQC -const float NUM_TEAM_1 = 4; // red -const float NUM_TEAM_2 = 13; // blue -const float NUM_TEAM_3 = 12; // yellow -const float NUM_TEAM_4 = 9; // pink +const int NUM_TEAM_1 = 4; // red +const int NUM_TEAM_2 = 13; // blue +const int NUM_TEAM_3 = 12; // yellow +const int NUM_TEAM_4 = 9; // pink #else -const float NUM_TEAM_1 = 5; // red -const float NUM_TEAM_2 = 14; // blue -const float NUM_TEAM_3 = 13; // yellow -const float NUM_TEAM_4 = 10; // pink +const int NUM_TEAM_1 = 5; // red +const int NUM_TEAM_2 = 14; // blue +const int NUM_TEAM_3 = 13; // yellow +const int NUM_TEAM_4 = 10; // pink #endif -const float NUM_SPECTATOR = 1337; +const int NUM_SPECTATOR = 1337; #endif const string COL_TEAM_1 = "^1"; @@ -165,3 +168,4 @@ float Team_TeamToNumber(float teamid) #define APP_TEAM_NUM_4(num,prefix) ((num == NUM_TEAM_1) ? prefix##RED : ((num == NUM_TEAM_2) ? prefix##BLUE : ((num == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK))) #define APP_TEAM_ENT_2(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : prefix##BLUE) #define APP_TEAM_ENT_4(ent,prefix) ((ent.team == NUM_TEAM_1) ? prefix##RED : ((ent.team == NUM_TEAM_2) ? prefix##BLUE : ((ent.team == NUM_TEAM_3) ? prefix##YELLOW : prefix##PINK))) +#endif