X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=536dee3ed1fb464479bd11620f38fea1e06103e7;hb=d91906e1bb6225cd68269812a6d2b4314e23fcdb;hp=17b75aeab646cdf039192b08a029d69b514a7681;hpb=f111e54b35268d60a0c32ba8ff85fe63834c6c7c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 17b75aeab..536dee3ed 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -21,7 +21,7 @@ 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; @@ -55,7 +55,7 @@ float team1_score, team2_score, team3_score, team4_score; float maxclients; // flag set on worldspawn so that the code knows if it is dedicated or not -float server_is_dedicated; +float server_is_dedicated; // Fields @@ -73,7 +73,8 @@ float server_is_dedicated; //.float style; //.float skill; .float sounds; -.float platmovetype; +.string platmovetype; +.float platmovetype_start, platmovetype_end; .string killtarget; @@ -103,6 +104,7 @@ float server_is_dedicated; .float play_time; .float respawn_flags; .float respawn_time; +.float respawn_time_max; .float death_time; .float fade_time; .float fade_rate; @@ -457,7 +459,6 @@ void W_Porto_Remove (entity p); .string message2; -vector railgun_start, railgun_end; // filled by FireRailgunBullet, used by damage code for head shot .float stat_allow_oldnexbeam; // reset to 0 on weapon switch @@ -470,10 +471,11 @@ void target_voicescript_clear(entity pl); .string target2; .string target3; .string target4; +.string curvetarget; .float target_random; .float trigger_reverse; -// Nexball +// Nexball .entity ballcarried; // Also used for keepaway .float metertime; float g_nexball_meter_period; @@ -514,8 +516,8 @@ string matchid; .float last_pickup; -.float hit_time; -.float typehit_time; +.float hit_time; +.float typehit_time; .float stat_leadlimit;