Merge branch 'z411/annce_queue' into 'master'

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

diff --git a/qcsrc/server/main.qh b/qcsrc/server/main.qh
index e189601a7c467cf9f757616fbc9ada286c9d62ae..ed095ba485ec56a78b603a59b9919d2e12875adf 100644 (file)
--- a/qcsrc/server/main.qh
+++ b/qcsrc/server/main.qh
@@ -28,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;
@@ -38,7 +35,8 @@ float client_cefc_accumulatortime;
 
 float servertime, serverprevtime, serverframetime;
 
-.vector oldvelocity; // for fall damage
+// set in CreatureFrame_All for entities that can be damaged by fall (players) and contents (projectiles)
+.vector oldvelocity;
 
 .float watersound_finished;
 
@@ -47,6 +45,8 @@ float servertime, serverprevtime, serverframetime;
 
 .float contents_damagetime;
 
+string GetField_fullspawndata(entity e, string f, ...);
+
 /*
 ==================
 main