X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=fb93b7c7876b3d133d4f5b30b2daa872b56e4aa8;hb=94a967120c8bfe0d4ffd95690b97e5af297dfc05;hp=ad932130049c712f16c82643f5aae3bc218c5435;hpb=b26f1812d999d544c7762afb3479bf93c4309d6b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index ad9321300..fb93b7c78 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -46,9 +46,6 @@ entity activator; float player_count; float currentbots; float bots_would_leave; -float lms_lowest_lives; -float lms_next_place; -float LMS_NewPlayerLives(); void UpdateFrags(entity player, float f); .float totalfrags; @@ -57,7 +54,8 @@ float team1_score, team2_score, team3_score, team4_score; float maxclients; -float server_is_local; // innocent until proven guilty by ClientConnect() in cl_client.qc +// flag set on worldspawn so that the code knows if it is dedicated or not +float server_is_dedicated; // Fields @@ -103,6 +101,7 @@ float server_is_local; // innocent until proven guilty by ClientConnect() in cl_ //.float cnt2; .float play_time; +.float respawn_flags; .float respawn_time; .float death_time; .float fade_time; @@ -117,44 +116,6 @@ float server_is_local; // innocent until proven guilty by ClientConnect() in cl_ .float animstate_override; .float animstate_looping; -// player animation data for this model -// each vector is as follows: -// _x = startframe -// _y = numframes -// _z = framerate -.vector anim_die1; // player dies -.vector anim_die2; // player dies differently -.vector anim_draw; // player pulls out a weapon -// .vector anim_duck; // player crouches (from idle to duckidle) -.vector anim_duckwalk; // player walking while crouching -.vector anim_duckjump; // player jumping from a crouch -.vector anim_duckidle; // player idling while crouching -.vector anim_idle; // player standing -.vector anim_jump; // player jump -.vector anim_pain1; // player flinches from pain -.vector anim_pain2; // player flinches from pain, differently -.vector anim_shoot; // player shoots -.vector anim_taunt; // player taunts others (FIXME: no code references this) -.vector anim_run; // player running forward -.vector anim_runbackwards; // player running backward -.vector anim_strafeleft; // player shuffling left quickly -.vector anim_straferight; // player shuffling right quickly -//.vector anim_dead1; // player dead (must be identical to last frame of die1) -//.vector anim_dead2; // player dead (must be identical to last frame of die2) -.vector anim_forwardright; // player running forward and right -.vector anim_forwardleft; // player running forward and left -.vector anim_backright; // player running backward and right -.vector anim_backleft; // player running back and left -.vector anim_melee; // player doing the melee action -.vector anim_duck; // player doing the melee action -.vector anim_duckwalkbackwards; -.vector anim_duckwalkstrafeleft; -.vector anim_duckwalkstraferight; -.vector anim_duckwalkforwardright; -.vector anim_duckwalkforwardleft; -.vector anim_duckwalkbackright; -.vector anim_duckwalkbackleft; - // weapon animation vectors: .vector anim_fire1; .vector anim_fire2; @@ -245,8 +206,6 @@ float WS_READY = 4; // idle frame void weapon_defaultspawnfunc(float wpn); -string w_deathtypestring; - .vector dest1, dest2; float gameover; @@ -254,9 +213,6 @@ float intermission_running; float intermission_exittime; float alreadychangedlevel; - -.float runes; - // Keys player is holding .float itemkeys; // message delay for func_door locked by keys and key locks @@ -281,9 +237,9 @@ float game_completion_ratio; // 0 at start, 1 near end .float winning; .float jointime; // time of joining .float alivetime; // time of being alive +.float motd_actived_time; // used for both motd and campaign_message float nJoinAllowed(entity ignore); -#define PREVENT_JOIN_TEXT "^1You may not join the game at this time.\n\nThe player limit reached maximum capacity." .float spawnshieldtime; @@ -292,8 +248,6 @@ float nJoinAllowed(entity ignore); .entity flagcarried; -.entity lastrocket; - .float playerid; float playerid_last; .float noalign; // if set to 1, the item or spawnpoint won't be dropped to the floor @@ -316,11 +270,6 @@ float default_weapon_alpha; .string cvar_g_xonoticversion; .string cvar_cl_weaponpriority; .string cvar_cl_weaponpriorities[10]; -#ifdef ALLOW_FORCEMODELS -.float cvar_cl_forceplayermodels; -.float cvar_cl_forceplayermodelsfromxonotic; -float sv_clforceplayermodels; -#endif .float cvar_cl_gunalign; .float cvar_cl_noantilag; @@ -330,9 +279,6 @@ float sv_clforceplayermodels; .float cvar_cl_allow_uidtracking; .string stored_netname; -void Announce(string snd); -void AnnounceTo(entity e, string snd); - .float version_nagtime; #define NUM_JUMPPADSUSED 3 @@ -343,9 +289,6 @@ string gamemode_name; float startitem_failed; -void DropAllRunes(entity pl); - - typedef .float floatfield; floatfield Item_CounterField(float it); @@ -474,7 +417,7 @@ void GlobalSound(string samplestring, float channel, float voicetype); void FakeGlobalSound(string samplestring, float channel, float voicetype); void VoiceMessage(string type, string message); float GetPlayerSoundSampleField_notFound; -.string GetVoiceMessageSampleField(string type) +.string GetVoiceMessageSampleField(string type); // autotaunt system .float cvar_cl_autotaunt; @@ -501,8 +444,10 @@ string cvar_changes; string cvar_purechanges; float cvar_purechanges_count; -float game_starttime; //point in time when the countdown 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 .float stat_game_starttime; +.float stat_round_starttime; .float stat_sv_airaccel_qw; .float stat_sv_airstrafeaccel_qw; @@ -591,7 +536,13 @@ float client_cefc_accumulatortime; .float clip_load; .float old_clip_load; .float clip_size; + +.entity lastrocket; .float minelayer_mines; +.float nex_charge; +.float nex_charge_rottime; +.float nex_chargepool_ammo; +.float hagar_load; .float grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab @@ -625,17 +576,9 @@ string deathmessage; #define ACTIVE_BUSY 2 #define ACTIVE_TOGGLE 3 .float active; -.float (float act_state) setactive; +.void (float act_state) setactive; .entity realowner; -.float nex_charge; -.float nex_charge_rottime; -.float nex_chargepool_ammo; - -.float hagar_load; - -float allowed_to_spawn; // boolean variable used by the clan arena code to determine if a player can spawn (after the round has ended) - float serverflags; .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator @@ -643,7 +586,6 @@ float serverflags; .float player_blocked; .float freezetag_frozen; -.float freezetag_revive_progress; .entity muzzle_flash; .float misc_bulletcounter; // replaces uzi & hlac bullet counter.