X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=8519c657a8d16ba5e1f9eb4337b2d5e51993f79a;hb=ee32da5f4dafee5883369c759fe8ed042114bda5;hp=7608bbeb4b4793a8601555490e565773d911a0de;hpb=58960b5b45e81dd77b709cff5e3ac23095055854;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 7608bbeb4..8519c657a 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -13,6 +13,7 @@ noref float require_spawnfunc_prefix; // if this float exists, only functions wi #define BUTTON_USE buttonuse #define BUTTON_DRAG button8 #define BUTTON_ZOOMSCRIPT button9 +#define BUTTON_JETPACK button10 // Globals @@ -82,7 +83,6 @@ float server_is_dedicated; .float pain_finished; //Added by Supajoe .float pain_frame; //" -.float statdraintime; // record the one-second intervals between draining health and armour when they're over 100 .float crouch; // Crouching or not? .float strength_finished; @@ -133,6 +133,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart .float species; +.float scheduledrespawntime; .float respawntime; .float respawntimejitter; //.float chasecam; @@ -155,7 +156,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart .float dmgtime; .float killcount; -.float hitsound, typehitsound; +.float damage_dealt, typehitsound; .float watersound_finished; .float iscreature; @@ -172,7 +173,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart .string item_pickupsound; // definitions for weaponsystem - +// more WEAPONTODO: move these to their proper files .entity weaponentity; .entity exteriorweaponentity; .vector weaponentity_glowmod; @@ -182,8 +183,9 @@ void setanim(entity e, vector anim, float looping, float override, float restart .float switchingweapon; // weapon currently being switched to (is copied from switchweapon once switch is possible) .string weaponname; // name of .weapon +// WEAPONTODO .float autoswitch; -float weapon_action(float wpn, float wrequest); +//float WEP_ACTION(float wpn, float wrequest); float client_hasweapon(entity cl, float wpn, float andammo, float complain); void w_clear(); void w_ready(); @@ -191,9 +193,6 @@ void w_ready(); .float weapon_nextthink; .void() weapon_think; -//float PLAYER_WEAPONSELECTION_DELAY = ); -const float PLAYER_WEAPONSELECTION_SPEED = 18; -const vector PLAYER_WEAPONSELECTION_RANGE = '0 20 -40'; // weapon states (self.weaponentity.state) const float WS_CLEAR = 0; // no weapon selected @@ -263,6 +262,7 @@ float default_weapon_alpha; .float cvar_cl_handicap; .float cvar_cl_clippedspectating; .float cvar_cl_autoscreenshot; +.float cvar_cl_jetpack_jump; .float cvar_cl_movement_track_canjump; .float cvar_cl_newusekeysupported; @@ -288,16 +288,12 @@ string gamemode_name; float startitem_failed; -typedef .float floatfield; -floatfield Item_CounterField(float it); - -float W_AmmoItemCode(float wpn); -string W_Name(float weaponid); string W_Apply_Weaponreplace(string in); void FixIntermissionClient(entity e); void FixClientCvars(entity e); +// WEAPONTODO: remove this WepSet weaponsInMap; .float respawn_countdown; // next number to count @@ -355,7 +351,6 @@ float next_pingtime; _VOICEMSG(death) \ _VOICEMSG(drown) \ _VOICEMSG(fall) \ - _VOICEMSG(fall) \ _VOICEMSG(falling) \ _VOICEMSG(gasp) \ _VOICEMSG(jump) \ @@ -459,7 +454,7 @@ void W_Porto_Remove (entity p); .string message2; -.float stat_allow_oldnexbeam; +.float stat_allow_oldvortexbeam; // reset to 0 on weapon switch // may be useful to all weapons @@ -494,8 +489,6 @@ void ClientData_Touch(entity e); float servertime, serverprevtime, serverframetime; -.entity soundentity; - .float ammo_fuel; .vector prevorigin; @@ -512,13 +505,14 @@ float servertime, serverprevtime, serverframetime; .float stat_shotorg; // networked stat for trueaim HUD string matchid; -.float hitplotfh; .float last_pickup; .float hit_time; .float typehit_time; +.float damage_dealt_total; + .float stat_leadlimit; float radar_showennemies; @@ -528,8 +522,6 @@ float client_cefc_accumulator; float client_cefc_accumulatortime; #endif -..float current_ammo; - .float weapon_load[WEP_MAXCOUNT]; .float ammo_none; // used by the reloading system, must always be 0 .float clip_load; @@ -538,9 +530,9 @@ float client_cefc_accumulatortime; .entity lastrocket; .float minelayer_mines; -.float nex_charge; -.float nex_charge_rottime; -.float nex_chargepool_ammo; +.float vortex_charge; +.float vortex_charge_rottime; +.float vortex_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 @@ -560,9 +552,6 @@ string deathmessage; .float just_joined; -.float cvar_cl_accuracy_data_share; -.float cvar_cl_accuracy_data_receive; - .float cvar_cl_weaponimpulsemode; .float selectweapon; // last selected weapon of the player @@ -577,11 +566,23 @@ string deathmessage; .void (float act_state) setactive; .entity realowner; +.float item_armor_large_time; +.float item_health_mega_time; +.float item_invisible_time; +.float item_speed_time; +.float item_extralife_time; +.float item_strength_time; +.float item_shield_time; +.float item_fuelregen_time; +.float item_jetpack_time; +.float item_superweapons_time; + float serverflags; .float team_forced; // can be a team number to force a team, or 0 for default action, or -1 for forced spectator .float player_blocked; +.float weapon_blocked; // weapon use disabled .float frozen; // for freeze attacks .float revive_progress; @@ -620,3 +621,12 @@ string modname; #define MISSILE_IS_CONFUSABLE(m) ((m.missile_flags & MIF_GUIDED_CONFUSABLE) ? TRUE : FALSE) #define MISSILE_IS_GUIDED(m) ((m.missile_flags & MIF_GUIDED_ALL) ? TRUE : FALSE) #define MISSILE_IS_TRACKING(m) ((m.missile_flags & MIF_GUIDED_TRACKING) ? TRUE : FALSE) + + +//// + +.entity player_stats; +//.float playerid; +.string playernick; +.float elos; +.float ranks;