Merge branch 'master' into develop

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

diff --git a/qcsrc/server/main.qh b/qcsrc/server/main.qh
index 0685ca71f37d6a6bff68b5b11ddbe4402d816f99..172e0a9e5719c0e1efe37faf3e43bf6e17f34859 100644 (file)
--- a/qcsrc/server/main.qh
+++ b/qcsrc/server/main.qh
@@ -16,6 +16,8 @@ bool autocvar_g_balance_falldamage_onlyvertical;
 #define autocvar_slowmo cvar("slowmo")
 float autocvar_sys_ticrate;
 
+bool dropclient_schedule(entity this);
+
 /** print(), but only print if the server is not local */
 void dedicated_print(string input);
 
@@ -26,9 +28,6 @@ void remove_safely(entity e);
 
 void remove_unsafely(entity e);
 
-// copies a string to a tempstring (so one can strunzone it)
-string strcat1(string s) = #115; // FRIK_FILE
-
 #ifdef PROFILING
 float client_cefc_accumulator;
 float client_cefc_accumulatortime;