X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=89582bb7a009f81e4e183604ebdd103894c610b8;hb=2460568b64231a7f1513adc22cf55bb4e934e06d;hp=f4d78b0e8b62b303506efbc6a11487589264c35e;hpb=4bb6b84519dbf3cce06996e37db18f5678dabba1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index f4d78b0e8..89582bb7a 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -162,7 +162,7 @@ float default_weapon_alpha; .float cvar_cl_clippedspectating; .float cvar_cl_autoscreenshot; .float cvar_cl_jetpack_jump; -.float cvar_cl_movement_track_canjump = _STAT(MOVEVARS_CL_TRACK_CANJUMP); +.float cvar_cl_movement_track_canjump; .float cvar_cl_newusekeysupported; .string cvar_g_xonoticversion; @@ -186,7 +186,7 @@ void FixIntermissionClient(entity e); void FixClientCvars(entity e); // WEAPONTODO: remove this -WepSet weaponsInMap; +//WepSet weaponsInMap; #define weapons _STAT(WEAPONS) @@ -256,8 +256,8 @@ string cvar_changes; string cvar_purechanges; float cvar_purechanges_count; -float game_starttime; //point in time when the countdown to game start is over -float round_starttime; //point in time when the countdown to round start is over +//float game_starttime; //point in time when the countdown to game start is over +//float round_starttime; //point in time when the countdown to round start is over void W_Porto_Remove (entity p); @@ -270,7 +270,6 @@ void W_Porto_Remove (entity p); .float bulletcounter; // Nexball -.entity ballcarried; // Also used for keepaway float g_nexball_meter_period; void SUB_DontUseTargets(entity this, entity actor, entity trigger); @@ -283,7 +282,7 @@ void ClientData_Touch(entity e); //vector debug_shotorg; // if non-zero, overrides the shot origin of all weapons -.float wasplayer; +.bool wasplayer; float servertime, serverprevtime, serverframetime; @@ -377,6 +376,8 @@ const float ACTIVE_TOGGLE = 3; .float stat_respawn_time = _STAT(RESPAWN_TIME); // shows respawn time, and is negative when awaiting respawn +.int killindicator_teamchange; + void PlayerUseKey(entity this); USING(spawn_evalfunc_t, vector(entity this, entity player, entity spot, vector current));