X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fdefs.qh;h=e9cf6ee286a7d8831806504435737977436d8e08;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hp=4c3b1d221ea4ae73be7f0ff7cc7b7ed5d7b9000f;hpb=97c65692317f85cabfc5fa35de8185505cefe7bf;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 4c3b1d221..e9cf6ee28 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -1,6 +1,5 @@ #pragma once -float warmup_limit; #include #include @@ -139,7 +138,8 @@ void checkSpectatorBlock(entity this); float game_completion_ratio; // 0 at start, 1 near end .float winning; -.float jointime; // time of joining +.float jointime; // time of connecting +.float startplaytime; // time of switching from spectator to player .float alivetime; // time of being alive .float motd_actived_time; // used for both motd and campaign_message @@ -222,6 +222,8 @@ int have_team_spawns_forteams; // if Xth bit is 1 then team X has spawns else it // set when showing a kill countdown .entity killindicator; +.bool canteamdamage; + void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force); float lockteams; @@ -376,6 +378,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));