Merge branch 'master' into terencehill/string_prefixes_cleanup

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

diff --git a/qcsrc/server/command/sv_cmd.qh b/qcsrc/server/command/sv_cmd.qh
index 03bd80cefc2f71fea3ddcdb4d7cbaa60bef1b2be..0cc520c2e402e21d6bed78e35a94365b9a6033ab 100644 (file)
--- a/qcsrc/server/command/sv_cmd.qh
+++ b/qcsrc/server/command/sv_cmd.qh
@@ -1,3 +1,6 @@
+#ifndef SV_CMD_H
+#define SV_CMD_H
+
 // =================================================
 //  Declarations for server side game commands
 //  Last updated: December 25th, 2011
@@ -7,10 +10,11 @@ string GotoMap(string m);
 
 void race_deleteTime(string map, float pos);
 
-#define SHUFFLETEAMS_MAX_PLAYERS 255
-#define SHUFFLETEAMS_MAX_TEAMS 4
+const float SHUFFLETEAMS_MAX_PLAYERS = 255;
+const float SHUFFLETEAMS_MAX_TEAMS = 4;
 float shuffleteams_players[SHUFFLETEAMS_MAX_PLAYERS]; // maximum of 255 player slots
 float shuffleteams_teams[SHUFFLETEAMS_MAX_TEAMS]; // maximum of 4 teams
 
 // used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
-void GameCommand_macro_write_aliases(float fh);
\ No newline at end of file
+void GameCommand_macro_write_aliases(float fh);
+#endif