Merge branch 'master' into Mario/minigames_merge

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 8e1d29231daef1bcb63f8425c411376ba8b1d3dd..5072e49002be11ab6a1dd845cbfacce27a75ed58 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -68,6 +68,11 @@ float server_is_dedicated;
 //.string      map;
 
 //.float       worldtype;
+// Needed for dynamic clientwalls
+.float inactive; // Clientwall disappears when inactive
+.float alpha_max, alpha_min;
+.float fade_start, fade_end, fade_vertical_offset;
+.float default_solid; // Variable to store default self.solid for clientwalls
 
 .float pain_finished;                  //Added by Supajoe
 .float pain_frame;                     //"
@@ -105,6 +110,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart
 
 .float species;
 
+.float scheduledrespawntime;
 .float respawntime;
 .float respawntimejitter;
 //.float       chasecam;
@@ -250,6 +256,8 @@ void FixClientCvars(entity e);
 // WEAPONTODO: remove this
 WepSet weaponsInMap;
 
+.WepSet weaponsinmap;
+
 .float respawn_countdown; // next number to count
 
 float bot_waypoints_for_items;
@@ -557,6 +565,8 @@ const int MIF_GUIDED_TAG = 128;
 .float elos;
 .float ranks;
 
+.string cvar_cl_physics;
+
 .float init_for_player_needed;
 .void(entity) init_for_player;