X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=afe376be2efe57c017fe635bfd61c0ee8521cb74;hb=2d297757fa597d275a9e64e5db36095d018a9518;hp=fb93b7c7876b3d133d4f5b30b2daa872b56e4aa8;hpb=0f060ee04a520b3692340198b22fa6184181c827;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index fb93b7c78..afe376be2 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -16,12 +16,12 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi
 
 // Globals
 
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_midair, g_minstagib, g_pinata, g_norecoil, g_minstagib_invis_alpha, g_bloodloss;
+float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib;
 float g_warmup_limit;
 float g_warmup_allguns;
 float g_warmup_allow_timeout;
 float g_race_qualifying;
-float inWarmupStage;
+float warmup_stage;
 float g_pickup_respawntime_weapon;
 float g_pickup_respawntime_superweapon;
 float g_pickup_respawntime_ammo;
@@ -191,15 +191,15 @@ void w_ready();
 .void() weapon_think;
 
 //float	PLAYER_WEAPONSELECTION_DELAY = );
-float	PLAYER_WEAPONSELECTION_SPEED = 18;
-vector	PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
+const float	PLAYER_WEAPONSELECTION_SPEED = 18;
+const vector	PLAYER_WEAPONSELECTION_RANGE = '0 20 -40';
 
 // weapon states (self.weaponentity.state)
-float WS_CLEAR			= 0; // no weapon selected
-float WS_RAISE			= 1; // raise frame
-float WS_DROP			= 2; // deselecting frame
-float WS_INUSE			= 3; // fire state
-float WS_READY			= 4; // idle frame
+const float WS_CLEAR			= 0; // no weapon selected
+const float WS_RAISE			= 1; // raise frame
+const float WS_DROP			= 2; // deselecting frame
+const float WS_INUSE			= 3; // fire state
+const float WS_READY			= 4; // idle frame
 
 // there is 2 weapon tics that can run in one server frame
 #define W_TICSPERFRAME 2
@@ -242,9 +242,7 @@ float game_completion_ratio; // 0 at start, 1 near end
 float nJoinAllowed(entity ignore);
 
 .float spawnshieldtime;
-
-.float lms_nextcheck;
-.float lms_traveled_distance;
+.float item_spawnshieldtime;
 
 .entity flagcarried;
 
@@ -299,7 +297,7 @@ string W_Apply_Weaponreplace(string in);
 void FixIntermissionClient(entity e);
 void FixClientCvars(entity e);
 
-WEPSET_DECLARE_A(weaponsInMap);
+WepSet weaponsInMap;
 
 .float respawn_countdown; // next number to count
 
@@ -552,7 +550,6 @@ float client_cefc_accumulatortime;
 
 .float spectatee_status;
 .float zoomstate;
-.float bloodloss_timer;
 .float restriction;
 
 .entity clientdata;
@@ -585,7 +582,10 @@ float serverflags;
 
 .float player_blocked;
 
-.float freezetag_frozen;
+.float frozen; // for freeze attacks
+.float revive_progress;
+.float revive_speed; // NOTE: multiplier (anything above 1 is instaheal)
+.entity iceblock;
 
 .entity muzzle_flash;
 .float misc_bulletcounter;	// replaces uzi & hlac bullet counter.