Merge branch 'terencehill/lms_spec' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / constants.qh

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index feaa9f8651ea47e3251ae867f5c88a335718edc0..18e4e6100142b9c4ee73c3fb27ab94ec61481db3 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -12,10 +12,12 @@ const int CVAR_NOTIFY = BIT(1);
 const int CVAR_READONLY = BIT(2);
 
 // server flags
+// NOTE: the engine doesn't clear serverflags on map change (gotomap)
 const int SERVERFLAG_ALLOW_FULLBRIGHT = BIT(0);
 const int SERVERFLAG_TEAMPLAY = BIT(1);
 const int SERVERFLAG_PLAYERSTATS = BIT(2);
 const int SERVERFLAG_PLAYERSTATS_CUSTOM = BIT(3);
+const int SERVERFLAG_FORBID_PICKUPTIMER = BIT(4);
 
 const int SPECIES_HUMAN = 0;
 const int SPECIES_ROBOT_SOLID = 1;
@@ -94,6 +96,9 @@ const int INITPRIO_DROPTOFLOOR                        = 20;
 const int INITPRIO_SETLOCATION                         = 90;
 const int INITPRIO_LINKDOORS                   = 91;
 const int INITPRIO_LAST                                = 99;
+
+// effects
+const int EF_SHOCK = 262144;
 #endif
 
 #if defined(SVQC)