X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fdefs.qh;h=84bcb2b3d1de61b9417c250c5f28d1ad4ce79270;hb=10c0e93c75ef6f408e3357bd5fb46c721e7e0576;hp=82c43e2e27a0be796c16d9e008312715d3be540b;hpb=1ba59bdc6b1e1ad0368f34dbd297e40cc42be243;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/defs.qh b/qcsrc/client/defs.qh index 82c43e2e2..84bcb2b3d 100644 --- a/qcsrc/client/defs.qh +++ b/qcsrc/client/defs.qh @@ -1,5 +1,4 @@ -#ifndef DEFS_H -#define DEFS_H +#pragma once // Additional OPTIONAL Fields and Globals //float intermission; @@ -23,8 +22,8 @@ float dmg_take; #endif // Basic variables -.float enttype; // entity type sent from server -.int sv_entnum; // entity number sent from server +.int enttype; // entity type sent from server +.int sv_entnum; // entity number sent from server .int team; .int team_size; @@ -95,7 +94,7 @@ float ticrate; const float MIN_DAMAGEEXTRARADIUS = 2; const float MAX_DAMAGEEXTRARADIUS = 16; .float damageextraradius; -.void(float thisdmg, int hittype, vector org, vector thisforce) event_damage; +.void(entity this, float thisdmg, int hittype, vector org, vector thisforce) event_damage; // only for Porto float angles_held_status; @@ -108,13 +107,6 @@ int w_deathtype; float w_issilent, w_random; vector w_org, w_backoff; -float rifle_scope; -float vortex_scope; - -float minelayer_maxmines; - -float hagar_maxrockets; - float bgmtime; string weaponorder_byimpulse; @@ -126,9 +118,6 @@ int serverflags; float uid2name_dialog; -.bool csqcmodel_isdead; // used by shownames and miscfunctions (float getplayerisdead(float) {}) to know when a player is dead +.bool csqcmodel_isdead; // used by shownames and miscfunctions (entcs_IsDead) to know when a player is dead #define player_currententnum (spectatee_status > 0 ? spectatee_status : player_localnum + 1) - -float g_balance_porto_secondary; -#endif