Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/server/mutators/gamemode_nexball.qh b/qcsrc/server/mutators/gamemode_nexball.qh
index 545ec96d75295764b09b55c6368cbf95f633a71c..e28fad883ca85f8f6afc30496aedc7b21c48a657 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qh
+++ b/qcsrc/server/mutators/gamemode_nexball.qh
@@ -1,16 +1,18 @@
+#ifndef GAMEMODE_NEXBALL_H
+#define GAMEMODE_NEXBALL_H
+
 //EF_BRIGHTFIELD|EF_BRIGHTLIGHT|EF_DIMLIGHT|EF_BLUE|EF_RED|EF_FLAME
-#define BALL_EFFECTMASK 1229
-#define BALL_MINS '-16 -16 -16'  // The model is 24*24*24
-#define BALL_MAXS '16 16 16'
-#define BALL_ATTACHORG '3 0 16'
-#define BALL_SPRITECOLOR '.91 .85 .62'
-#define BALL_FOOT   1
-#define BALL_BASKET 2
+const float BALL_EFFECTMASK = 1229;
+const vector BALL_MINS = '-16 -16 -16'; // The model is 24*24*24
+const vector BALL_MAXS = '16 16 16';
+const vector BALL_ATTACHORG = '3 0 16';
+const float BALL_FOOT = 1;
+const float BALL_BASKET = 2;
 //spawnflags
-#define GOAL_TOUCHPLAYER 1
+const float GOAL_TOUCHPLAYER = 1;
 //goal types
-#define GOAL_FAULT -1
-#define GOAL_OUT -2
+const float GOAL_FAULT = -1;
+const float GOAL_OUT = -2;
 
 void DropBall(entity ball, vector org, vector vel);
 float autocvar_g_nexball_football_boost_forward;
@@ -27,4 +29,8 @@ float balls;
 float ball_scale;
 float nb_teams;
 
-.float teamtime;
\ No newline at end of file
+.entity nb_dropper;
+.float nb_droptime;
+
+.float teamtime;
+#endif