X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdefs.qh;h=c3b6cf3c71122c1b57cc6478b272339b1c746362;hb=6fefb38d7618ba85d7ec2484d18231a76373f313;hp=bc05d1b04849b05ced40ef7b3ae1a20f0f7c36c8;hpb=99f9633d94746e80f8c0d55dcaf623677eae8a67;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index bc05d1b04..c3b6cf3c7 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 @@ -189,6 +189,7 @@ void setanim(entity e, vector anim, float looping, float override, float restart .float watersound_finished; .float iscreature; +.float damagedbycontents; .vector oldvelocity; .float pauseregen_finished; @@ -245,6 +246,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; @@ -314,7 +321,9 @@ float default_weapon_alpha; .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; .string cvar_g_xonoticversion; .string cvar_cl_weaponpriority; @@ -608,6 +617,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 @@ -660,3 +671,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;