X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=41e368a0e2b99a97aade68f4eaccb78d72069cef;hb=8f4d064a1d62a040e788fc0634baf93e888ba2f6;hp=9c2e843d1a6089fe4640134128232b46ac2d4840;hpb=50e00110bb3855e1d989c0461dbf05ad9950e8e2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 9c2e843d1..41e368a0e 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -1,6 +1,6 @@ #define INDEPENDENT_ATTACK_FINISHED -float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions +noref float require_spawnfunc_prefix; // if this float exists, only functions with spawnfunc_ name prefix qualify as spawn functions #define BUTTON_ATCK button0 #define BUTTON_JUMP button2 @@ -128,7 +128,7 @@ float maxclients; .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_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 @@ -149,6 +149,14 @@ float maxclients; .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; @@ -246,6 +254,12 @@ float alreadychangedlevel; .float runes; +// Keys player is holding +.float itemkeys; +// message delay for func_door locked by keys and key locks +// this field is used on player entities +.float key_door_messagetime; + .float version; @@ -313,8 +327,8 @@ float default_weapon_alpha; .float() customizeentityforclient; .float cvar_cl_handicap; -.float cvar_cl_playerdetailreduction; .float cvar_cl_clippedspectating; +.float cvar_cl_autoscreenshot; .float cvar_cl_movement_track_canjump; .float cvar_cl_newusekeysupported; @@ -326,8 +340,6 @@ float default_weapon_alpha; .float cvar_cl_forceplayermodelsfromxonotic; float sv_clforceplayermodels; #endif -float sv_loddistance1; -float sv_loddistance2; .float cvar_cl_gunalign; .float cvar_cl_noantilag; @@ -342,12 +354,6 @@ void AnnounceTo(entity e, string snd); .float version_nagtime; -.float modelindex_lod0; -.float modelindex_lod0_from_xonotic; -.float skinindex; -.float modelindex_lod1; -.float modelindex_lod2; - #define NUM_JUMPPADSUSED 3 .float jumppadcount; .entity jumppadsused[NUM_JUMPPADSUSED]; @@ -357,7 +363,6 @@ string gamemode_name; float startitem_failed; void DropFlag(entity flag, entity penalty_receiver, entity attacker); -void DropBall(entity ball, vector org, vector vel); void DropAllRunes(entity pl); @@ -610,6 +615,8 @@ float client_cefc_accumulatortime; .float clip_size; .float minelayer_mines; +.float grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab + #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE // when doing this, hagar can go through clones // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX @@ -662,3 +669,6 @@ float serverflags; .float misc_bulletcounter; // replaces uzi & hlac bullet counter. void PlayerUseKey(); + +typedef vector(entity player, entity spot, vector current) spawn_evalfunc_t; +.spawn_evalfunc_t spawn_evalfunc;