#ifndef SERVER_DEFS_H
#define SERVER_DEFS_H
-#include "../common/weapons/weapons.qh"
+#include "../common/weapons/all.qh"
#define INDEPENDENT_ATTACK_FINISHED
-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
#define BUTTON_ATCK2 button3
float sv_clones;
float sv_foginterval;
-entity activator;
-
float player_count;
float currentbots;
float bots_would_leave;
// Fields
-.void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) event_damage;
+.void(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) event_damage;
//.string wad;
//.string map;
//.float worldtype;
-.float delay;
-.float wait;
-.float lip;
-//.float light_lev;
-.float speed;
-//.float style;
-//.float skill;
-.float sounds;
-.string platmovetype;
-.float platmovetype_start, platmovetype_end;
-
-.string killtarget;
-
-.vector pos1, pos2;
-.vector mangle;
+// Needed for dynamic clientwalls
+.float inactive; // Clientwall disappears when inactive
+.float alpha_max, alpha_min;
+.float fade_start, fade_end, fade_vertical_offset;
+.float default_solid; // Variable to store default self.solid for clientwalls
.float pain_finished; //Added by Supajoe
.float pain_frame; //"
.float invincible_finished;
.float superweapons_finished;
-.vector finaldest, finalangle; //plat.qc stuff
-.void() think1;
-.float state;
-.float t_length, t_width;
-
-.vector destvec; // for rain
-.vector destvec2; // for train
-.float cnt; // for rain
+.float cnt; // used in too many places
.float count;
//.float cnt2;
.float fade_time;
.float fade_rate;
-// player animation state
-.float animstate_startframe;
-.float animstate_numframes;
-.float animstate_framerate;
-.float animstate_starttime;
-.float animstate_endtime;
-.float animstate_override;
-.float animstate_looping;
-
// weapon animation vectors:
.vector anim_fire1;
.vector anim_fire2;
.float species;
+.float scheduledrespawntime;
.float respawntime;
.float respawntimejitter;
//.float chasecam;
.float pauserothealth_finished;
.float pauserotarmor_finished;
.float pauserotfuel_finished;
+// string overrides entity
.string item_pickupsound;
+.entity item_pickupsound_ent;
// definitions for weaponsystem
// more WEAPONTODO: move these to their proper files
// WEAPONTODO
.float autoswitch;
-//float WEP_ACTION(float wpn, float wrequest);
float client_hasweapon(entity cl, float wpn, float andammo, float complain);
-void w_clear();
-void w_ready();
+void w_clear(Weapon thiswep, entity actor, bool fire1, bool fire2);
+void w_ready(Weapon thiswep, entity actor, bool fire1, bool fire2);
// VorteX: standalone think for weapons, so normal think on weaponentity can be reserved by weaponflashes (which needs update even player dies)
.float weapon_nextthink;
-.void() weapon_think;
+.void(Weapon thiswep, entity actor, bool fire1, bool fire2) weapon_think;
// weapon states (self.weaponentity.state)
void weapon_defaultspawnfunc(float wpn);
-.vector dest1, dest2;
-
float gameover;
float intermission_running;
float intermission_exittime;
float alreadychangedlevel;
-// 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;
-//swamp
-.float in_swamp; // bool
-.entity swampslug; // Uses this to release from swamp ("untouch" fix)
-
// footstep interval
.float nextstep;
.entity flagcarried;
-.float playerid;
+.int playerid;
float playerid_last;
.float noalign; // if set to 1, the item or spawnpoint won't be dropped to the floor
.float version_nagtime;
-const int NUM_JUMPPADSUSED = 3;
-.float jumppadcount;
-.entity jumppadsused[NUM_JUMPPADSUSED];
-
string gamemode_name;
float startitem_failed;
// WEAPONTODO: remove this
WepSet weaponsInMap;
+.WepSet weaponsinmap;
+
.float respawn_countdown; // next number to count
float bot_waypoints_for_items;
.entity killindicator;
.float killindicator_teamchange;
-void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force);
+void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
float lockteams;
float next_pingtime;
.float Version;
-.int SendFlags;
-.float(entity to, float sendflags) SendEntity;
// player sounds, voice messages
// TODO implemented fall and falling
.float stat_game_starttime;
.float stat_round_starttime;
-.float stat_sv_airaccel_qw;
-.float stat_sv_airstrafeaccel_qw;
-.float stat_sv_airspeedlimit_nonqw;
-.float stat_sv_maxspeed;
-
void W_Porto_Remove (entity p);
.int projectiledeathtype;
// may be useful to all weapons
.float bulletcounter;
-void target_voicescript_next(entity pl);
-void target_voicescript_clear(entity pl);
-
-.string target2;
-.string target3;
-.string target4;
-.string curvetarget;
-.float target_random;
-.float trigger_reverse;
-
// Nexball
.entity ballcarried; // Also used for keepaway
.float metertime;
.float stat_leadlimit;
-float radar_showennemies;
+bool radar_showennemies;
#ifdef PROFILING
float client_cefc_accumulator;
#endif
.float weapon_load[WEP_MAXCOUNT];
-.float ammo_none; // used by the reloading system, must always be 0
+.int ammo_none; // used by the reloading system, must always be 0
.float clip_load;
.float old_clip_load;
.float clip_size;
.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
+.int 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
typedef vector(entity player, entity spot, vector current) spawn_evalfunc_t;
.spawn_evalfunc_t spawn_evalfunc;
-.entity conveyor;
-
string modname;
.float missile_flags;
.float elos;
.float ranks;
+.string cvar_cl_physics;
+
.float init_for_player_needed;
.void(entity) init_for_player;