X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fconstants.qh;h=96368bd15d2901f6d141d5e499bb15fad5fbe5e8;hb=1a1a95ac3e0b1262f92bf42874d9139784399211;hp=8450fe964c967b912f4897e40e7edc7825648456;hpb=1d70346809dd33b32864b3832662878077588e4b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 8450fe964..96368bd15 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -26,22 +26,12 @@ // Revision 22: hook shot origin #define CSQC_REVISION 22 -const int AS_STRING = 1; -const int AS_INT = 2; -const int AS_FLOAT_TRUNCATED = 2; -const int AS_FLOAT = 8; - REGISTER_NET_TEMP(TE_CSQC_PICTURE) REGISTER_NET_TEMP(TE_CSQC_RACE) -REGISTER_NET_TEMP(TE_CSQC_VORTEXBEAMPARTICLE) -REGISTER_NET_TEMP(TE_CSQC_ARC) REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER) REGISTER_NET_TEMP(TE_CSQC_PINGPLREPORT) -REGISTER_NET_TEMP(TE_CSQC_TARGET_MUSIC) REGISTER_NET_TEMP(TE_CSQC_WEAPONCOMPLAIN) REGISTER_NET_TEMP(TE_CSQC_VEHICLESETUP) -REGISTER_NET_TEMP(TE_CSQC_SVNOTICE) -REGISTER_NET_TEMP(TE_CSQC_SHOCKWAVEPARTICLE) const int RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const int RACE_NET_CHECKPOINT_CLEAR = 1; @@ -58,57 +48,38 @@ const int RACE_NET_SERVER_RANKINGS = 11; const int RACE_NET_SERVER_STATUS = 12; const int RANKINGS_CNT = 15; -REGISTER_NET_LINKED(ENT_CLIENT_ENTCS) +REGISTER_NET_LINKED(_ENT_CLIENT_INIT) +#ifdef CSQC +NET_HANDLE(_ENT_CLIENT_INIT, bool isnew) { return true; } +#endif +/** Sent as a temp entity from a persistent linked entity */ +REGISTER_NET_TEMP(ENT_CLIENT_INIT) + REGISTER_NET_LINKED(ENT_CLIENT_SCORES_INFO) REGISTER_NET_LINKED(ENT_CLIENT_SCORES) REGISTER_NET_LINKED(ENT_CLIENT_TEAMSCORES) -REGISTER_NET_LINKED(ENT_CLIENT_POINTPARTICLES) -REGISTER_NET_LINKED(ENT_CLIENT_RAINSNOW) -REGISTER_NET_LINKED(ENT_CLIENT_LASER) REGISTER_NET_LINKED(ENT_CLIENT_NAGGER) // flags [votecalledvote] REGISTER_NET_LINKED(ENT_CLIENT_RADARLINK) // flags [startorigin] [endorigin] [startcolor+16*endcolor] REGISTER_NET_LINKED(ENT_CLIENT_PROJECTILE) -REGISTER_NET_LINKED(ENT_CLIENT_DAMAGEINFO) -REGISTER_NET_LINKED(ENT_CLIENT_INIT) REGISTER_NET_LINKED(ENT_CLIENT_MAPVOTE) REGISTER_NET_LINKED(ENT_CLIENT_CLIENTDATA) REGISTER_NET_LINKED(ENT_CLIENT_RANDOMSEED) -REGISTER_NET_LINKED(ENT_CLIENT_WALL) -REGISTER_NET_LINKED(ENT_CLIENT_MODELEFFECT) -REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE) +REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY) +REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS) + +REGISTER_NET_LINKED(ENT_CLIENT_MODEL) + REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE) REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_CAMERA) -REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_MUSIC) -REGISTER_NET_LINKED(ENT_CLIENT_HOOK) -REGISTER_NET_LINKED(ENT_CLIENT_INVENTORY) -REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM) // WEAPONTODO: fix numbers -REGISTER_NET_LINKED(ENT_CLIENT_ACCURACY) REGISTER_NET_LINKED(ENT_CLIENT_WARPZONE_TELEPORTED) -REGISTER_NET_LINKED(ENT_CLIENT_MODEL) -REGISTER_NET_LINKED(ENT_CLIENT_ITEM) -REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN) + +REGISTER_NET_LINKED(ENT_CLIENT_ARC_BEAM) +REGISTER_NET_LINKED(ENT_CLIENT_HOOK) +REGISTER_NET_LINKED(ENT_CLIENT_TUBANOTE) + REGISTER_NET_LINKED(ENT_CLIENT_SPAWNPOINT) REGISTER_NET_LINKED(ENT_CLIENT_SPAWNEVENT) -REGISTER_NET_LINKED(ENT_CLIENT_NOTIFICATION) -REGISTER_NET_LINKED(ENT_CLIENT_ELIMINATEDPLAYERS) -REGISTER_NET_LINKED(ENT_CLIENT_TURRET) -REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR) -REGISTER_NET_LINKED(ENT_CLIENT_LADDER) -REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_PUSH) -REGISTER_NET_LINKED(ENT_CLIENT_TARGET_PUSH) -REGISTER_NET_LINKED(ENT_CLIENT_CONVEYOR) -REGISTER_NET_LINKED(ENT_CLIENT_DOOR) -REGISTER_NET_LINKED(ENT_CLIENT_TRAIN) -REGISTER_NET_LINKED(ENT_CLIENT_PLAT) -REGISTER_NET_LINKED(ENT_CLIENT_TRIGGER_IMPULSE) -REGISTER_NET_LINKED(ENT_CLIENT_SWAMP) -REGISTER_NET_LINKED(ENT_CLIENT_CORNER) -REGISTER_NET_LINKED(ENT_CLIENT_KEYLOCK) -REGISTER_NET_LINKED(ENT_CLIENT_GENERATOR) -REGISTER_NET_LINKED(ENT_CLIENT_CONTROLPOINT_ICON) -REGISTER_NET_LINKED(ENT_CLIENT_MINIGAME) -REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC) -REGISTER_NET_LINKED(ENT_CLIENT_VIEWLOC_TRIGGER) +REGISTER_NET_LINKED(ENT_CLIENT_WALL) const int SPRITERULE_DEFAULT = 0; const int SPRITERULE_TEAMPLAY = 1; @@ -135,10 +106,6 @@ const int CVAR_READONLY = 4; /////////////////////////// // csqc communication stuff -const int CTF_STATE_ATTACK = 1; -const int CTF_STATE_DEFEND = 2; -const int CTF_STATE_COMMANDER = 3; - const int HUD_NORMAL = 0; const int HUD_BUMBLEBEE_GUN = 25; @@ -196,34 +163,6 @@ const int SP_DMG = 10; const int SP_DMGTAKEN = 11; // game mode specific indices are not in common/, but in server/scores_rules.qc! -const int CH_INFO = 0; -const int CH_TRIGGER = -3; -const int CH_WEAPON_A = -1; -const int CH_WEAPON_SINGLE = 1; -const int CH_VOICE = -2; -const int CH_BGM_SINGLE = 8; -const int CH_AMBIENT = -9; -const int CH_TRIGGER_SINGLE = 3; -const int CH_SHOTS = -4; -const int CH_SHOTS_SINGLE = 4; -const int CH_WEAPON_B = -1; -const int CH_PAIN = -6; -const int CH_PAIN_SINGLE = 6; -const int CH_PLAYER = -7; -const int CH_PLAYER_SINGLE = 7; -const int CH_TUBA_SINGLE = 5; - -const float ATTEN_NONE = 0; -const float ATTEN_MIN = 0.015625; -const float ATTEN_NORM = 0.5; -const float ATTEN_LARGE = 1; -const float ATTEN_IDLE = 2; -const float ATTEN_STATIC = 3; -const float ATTEN_MAX = 3.984375; - -const float VOL_BASE = 0.7; -const float VOL_BASEVOICE = 1.0; - // WEAPONTODO: move this into separate/new projectile handling code // this sets sounds and other properties of the projectiles in csqc const int PROJECTILE_ELECTRO = 1; const int PROJECTILE_ROCKET = 2; @@ -299,22 +238,12 @@ vector autocvar_sv_player_headsize = '24 24 12'; // not so constant -#ifdef SVQC -#define PL_VIEW_OFS autocvar_sv_player_viewoffset -#define PL_MIN autocvar_sv_player_mins -#define PL_MAX autocvar_sv_player_maxs -#define PL_CROUCH_VIEW_OFS autocvar_sv_player_crouch_viewoffset -#define PL_CROUCH_MIN autocvar_sv_player_crouch_mins -#define PL_CROUCH_MAX autocvar_sv_player_crouch_maxs -#define PL_HEAD autocvar_sv_player_headsize -#elif defined(CSQC) -#define PL_VIEW_OFS vec3(getstatf(STAT_PL_VIEW_OFS1), getstatf(STAT_PL_VIEW_OFS2), getstatf(STAT_PL_VIEW_OFS3)) -#define PL_MIN vec3(getstatf(STAT_PL_MIN1), getstatf(STAT_PL_MIN2), getstatf(STAT_PL_MIN3)) -#define PL_MAX vec3(getstatf(STAT_PL_MAX1), getstatf(STAT_PL_MAX2), getstatf(STAT_PL_MAX3)) -#define PL_CROUCH_VIEW_OFS vec3(getstatf(STAT_PL_CROUCH_VIEW_OFS1), getstatf(STAT_PL_CROUCH_VIEW_OFS2), getstatf(STAT_PL_CROUCH_VIEW_OFS3)) -#define PL_CROUCH_MIN vec3(getstatf(STAT_PL_CROUCH_MIN1), getstatf(STAT_PL_CROUCH_MIN2), getstatf(STAT_PL_CROUCH_MIN3)) -#define PL_CROUCH_MAX vec3(getstatf(STAT_PL_CROUCH_MAX1), getstatf(STAT_PL_CROUCH_MAX2), getstatf(STAT_PL_CROUCH_MAX3)) -#endif +#define PL_VIEW_OFS STAT(PL_VIEW_OFS, NULL) +#define PL_CROUCH_VIEW_OFS STAT(PL_CROUCH_VIEW_OFS, NULL) +#define PL_MIN STAT(PL_MIN, NULL) +#define PL_CROUCH_MIN STAT(PL_CROUCH_MIN, NULL) +#define PL_MAX STAT(PL_MAX, NULL) +#define PL_CROUCH_MAX STAT(PL_CROUCH_MAX, NULL) // a bit more constant const vector PL_MAX_CONST = '16 16 45';