#define BUTTON_USE buttonuse
#define BUTTON_DRAG button8
#define BUTTON_ZOOMSCRIPT button9
+#define BUTTON_JETPACK button10
// Globals
-float g_cloaked, g_footsteps, g_grappling_hook, g_minstagib;
+float g_cloaked, g_footsteps, g_grappling_hook, g_instagib;
float g_warmup_limit;
float g_warmup_allguns;
float g_warmup_allow_timeout;
-float g_race_qualifying;
float warmup_stage;
float g_pickup_respawntime_weapon;
float g_pickup_respawntime_superweapon;
.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;
//.float chasecam;
.float damageforcescale;
-#define MIN_DAMAGEEXTRARADIUS 2
-#define MAX_DAMAGEEXTRARADIUS 16
+const float MIN_DAMAGEEXTRARADIUS = 2;
+const float MAX_DAMAGEEXTRARADIUS = 16;
.float damageextraradius;
//.float gravity;
.float dmgtime;
.float killcount;
-.float hitsound, typehitsound;
+.float damage_dealt, typehitsound;
.float watersound_finished;
.float iscreature;
.string item_pickupsound;
// definitions for weaponsystem
-
+// more WEAPONTODO: move these to their proper files
.entity weaponentity;
.entity exteriorweaponentity;
.vector weaponentity_glowmod;
.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();
.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
const float WS_RAISE = 1; // raise frame
-const float WS_DROP = 2; // deselecting frame
+const float WS_DROP = 2; // deselecting frame
const float WS_INUSE = 3; // fire state
const float WS_READY = 4; // idle frame
// there is 2 weapon tics that can run in one server frame
-#define W_TICSPERFRAME 2
+const float W_TICSPERFRAME = 2;
void weapon_defaultspawnfunc(float wpn);
.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;
.float version_nagtime;
-#define NUM_JUMPPADSUSED 3
+const float NUM_JUMPPADSUSED = 3;
.float jumppadcount;
.entity jumppadsused[NUM_JUMPPADSUSED];
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
_VOICEMSG(death) \
_VOICEMSG(drown) \
_VOICEMSG(fall) \
- _VOICEMSG(fall) \
_VOICEMSG(falling) \
_VOICEMSG(gasp) \
_VOICEMSG(jump) \
string globalsound_step;
string globalsound_metalstep;
-#define VOICETYPE_PLAYERSOUND 10
-#define VOICETYPE_TEAMRADIO 11
-#define VOICETYPE_LASTATTACKER 12
-#define VOICETYPE_LASTATTACKER_ONLY 13
-#define VOICETYPE_AUTOTAUNT 14
-#define VOICETYPE_TAUNT 15
+const float VOICETYPE_PLAYERSOUND = 10;
+const float VOICETYPE_TEAMRADIO = 11;
+const float VOICETYPE_LASTATTACKER = 12;
+const float VOICETYPE_LASTATTACKER_ONLY = 13;
+const float VOICETYPE_AUTOTAUNT = 14;
+const float VOICETYPE_TAUNT = 15;
void PrecachePlayerSounds(string f);
void PrecacheGlobalSound(string samplestring);
void W_Porto_Remove (entity p);
-.float projectiledeathtype;
+.int projectiledeathtype;
.string message2;
-.float stat_allow_oldnexbeam;
+.float stat_allow_oldvortexbeam;
// reset to 0 on weapon switch
// may be useful to all weapons
float servertime, serverprevtime, serverframetime;
-.entity soundentity;
-
.float ammo_fuel;
.vector prevorigin;
.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;
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;
.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
.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
.float ballistics_density; // wall piercing factor, larger = bullet can pass through more
-#define ACTIVE_NOT 0
-#define ACTIVE_ACTIVE 1
-#define ACTIVE_IDLE 2
-#define ACTIVE_BUSY 2
-#define ACTIVE_TOGGLE 3
+const float ACTIVE_NOT = 0;
+const float ACTIVE_ACTIVE = 1;
+const float ACTIVE_IDLE = 2;
+const float ACTIVE_BUSY = 2;
+const float ACTIVE_TOGGLE = 3;
.float active;
.void (float act_state) setactive;
.entity realowner;
-float serverflags;
+//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;
string modname;
.float missile_flags;
-#define MIF_SPLASH 2
-#define MIF_ARC 4
-#define MIF_PROXY 8
-#define MIF_GUIDED_MANUAL 16
-#define MIF_GUIDED_HEAT 32
-#define MIF_GUIDED_LASER 64
-#define MIF_GUIDED_AI 128
-#define MIF_GUIDED_TAG 128
+const int MIF_SPLASH = 2;
+const int MIF_ARC = 4;
+const int MIF_PROXY = 8;
+const int MIF_GUIDED_MANUAL = 16;
+const int MIF_GUIDED_HEAT = 32;
+const int MIF_GUIDED_LASER = 64;
+const int MIF_GUIDED_AI = 128;
+const int MIF_GUIDED_TAG = 128;
#define MIF_GUIDED_ALL (MIF_GUIDED_MANUAL | MIF_GUIDED_HEAT | MIF_GUIDED_LASER | MIF_GUIDED_AI | MIF_GUIDED_TAG)
#define MIF_GUIDED_TRACKING (MIF_GUIDED_HEAT | MIF_GUIDED_LASER | MIF_GUIDED_AI | MIF_GUIDED_TAG)
#define MIF_GUIDED_CONFUSABLE (MIF_GUIDED_HEAT | MIF_GUIDED_AI)
-#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)
+#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;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff