sv_maxidle: remove disabled announcer countdown

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

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 0663c49cfac876892bd3a10c4a02275c0c955a3d..63fd27839d15ee0617d873c3f55f6758408173f1 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,9 +1,5 @@
 #pragma once
 
-#ifdef SVQC
-       #include <server/autocvars.qh>
-#endif
-
 #ifdef SVQC
 float tracebox_inverted (vector v1, vector mi, vector ma, vector v2, float nomonsters, entity forent, float stopatentity, entity ignorestopatentity); // returns the number of traces done, for benchmarking
 
@@ -197,8 +193,11 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 
 #ifdef GAMEQC
        #ifdef CSQC
+               bool autocvar_cl_gentle;
+               int autocvar_cl_gentle_messages;
                #define GENTLE (autocvar_cl_gentle || autocvar_cl_gentle_messages)
        #else
+               int autocvar_sv_gentle;
                #define GENTLE autocvar_sv_gentle
        #endif
        #define normal_or_gentle(normal, gentle) ((GENTLE && (gentle != "")) ? gentle : normal)
@@ -211,7 +210,7 @@ vector animfixfps(entity e, vector a, vector b);
 #ifdef GAMEQC
 const int CNT_NORMAL = 1;
 const int CNT_GAMESTART = 2;
-const int CNT_IDLE = 3;
+//const int CNT_IDLE = 3;
 const int CNT_KILL = 4;
 const int CNT_RESPAWN = 5;
 const int CNT_ROUNDSTART = 6;
@@ -230,16 +229,12 @@ int Mod_Q1BSP_NativeContentsFromSuperContents(int supercontents);
 
 #ifdef SVQC
 void attach_sameorigin(entity e, entity to, string tag);
-
 void detach_sameorigin(entity e);
-
 void follow_sameorigin(entity e, entity to);
 
 void SetMovetypeFollow(entity ent, entity e);
-
 void UnsetMovetypeFollow(entity ent);
-
-float LostMovetypeFollow(entity ent);
+int LostMovetypeFollow(entity ent);
 #endif
 
 #ifdef GAMEQC