X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fconstants.qh;h=c59901b21475b5c7e505aee04a4167dcca0d0cbd;hb=5043d85bbf5246ed541db900a95d3f18c01be602;hp=aa300ba74c0beaf57116ec1ab852e5bad8502fca;hpb=add5162c2c034ff0e9eda824d3bf2b82e627be6c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index aa300ba74..c59901b21 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -55,12 +55,12 @@ const float TE_CSQC_NEXGUNBEAMPARTICLE = 104; const float TE_CSQC_LIGHTNINGARC = 105; const float TE_CSQC_TEAMNAGGER = 106; const float TE_CSQC_PINGPLREPORT = 107; -const float TE_CSQC_VOTE = 108; -const float TE_CSQC_VOTERESET = 109; const float TE_CSQC_ANNOUNCE = 110; const float TE_CSQC_TARGET_MUSIC = 111; -const float TE_CSQC_NOTIFY = 112; -const float TE_CSQC_WEAPONCOMPLAIN = 113; +const float TE_CSQC_KILLNOTIFY = 112; +const float TE_CSQC_KILLCENTERPRINT = 113; +const float TE_CSQC_CENTERPRINT_GENERIC = 114; +const float TE_CSQC_WEAPONCOMPLAIN = 115; const float TE_CSQC_NEX_SCOPE = 116; const float TE_CSQC_MINELAYER_MAXMINES = 117; const float TE_CSQC_HAGAR_MAXROCKETS = 118; @@ -81,9 +81,6 @@ const float RACE_NET_SERVER_RANKINGS = 11; const float RACE_NET_SERVER_STATUS = 12; const float RANKINGS_CNT = 15; -const float CSQC_KILLNOTIFY = 0; -const float CSQC_CENTERPRINT = 1; - const float ENT_CLIENT = 0; const float ENT_CLIENT_DEAD = 1; const float ENT_CLIENT_ENTCS = 2; @@ -125,6 +122,7 @@ const float ENT_CLIENT_VEHICLE = 60; const float SPRITERULE_DEFAULT = 0; const float SPRITERULE_TEAMPLAY = 1; +const float RADARICON_NONE = 0; const float RADARICON_FLAG = 1; const float RADARICON_FLAGCARRIER = 1; const float RADARICON_HERE = 1; // TODO make these 3 and 4, and make images for them @@ -325,6 +323,7 @@ const float STAT_HIT_TIME = 54; const float STAT_TYPEHIT_TIME = 55; const float STAT_LAYED_MINES = 56; const float STAT_HAGAR_LOAD = 57; +const float STAT_SWITCHINGWEAPON = 58; // see DP source, quakedef.h const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222; @@ -428,51 +427,44 @@ const float STAT_DOM_PPS_YELLOW = 104; #define SP_SCORE 3 // game mode specific indices are not in common/, but in server/scores_rules.qc! -// this assignment must match menu/xonotic/dialog_settings_misc.c! -float CHAN_AUTO = 0; - // on world: announcers, ... INFO - // on players: item pickup ITEMS - // on entities: UNUSED - // on csqc: announcers INFO -float CHAN_WEAPON = 1; // Weapon fire - // on world: UNUSED - // on players: weapon firing WEAPONS - // on entities: turret firing WEAPONS - // on csqc: UNUSED -float CHAN_VOICE = 2; // Voice/Radio - // on world: UNUSED - // on players: voice VOICE - // on entities: ambient AMBIENT - // on csqc: background music BGM -float CHAN_TRIGGER = 3; // Triggers/Items - // on world: UNUSED - // on players: item pickup ITEMS - // on entities: platforms moving etc. ITEMS - // on csqc: platforms moving etc. ITEMS -float CHAN_PROJECTILE = 4; // Projectiles - // on world: UNUSED - // on players: projectiles hitting player SHOTS - // on entities: projectiles SHOTS - // on csqc: projectile sounds SHOTS -float CHAN_WEAPON2 = 5; // Nex fire (separated as it is a very long sound) - // on world: UNUSED - // on players: weapon firing WEAPONS - // on entities: turret firing WEAPONS - // on csqc: UNUSED -float CHAN_PAIN = 6; // Pain - // on world: UNUSED - // on players: pain PAIN - // on entities: projectiles flying SHOTS - // on csqc: player pain PAIN -float CHAN_PLAYER = 7; // Player body - // on world: UNUSED - // on players: player sounds PLAYER - // on entities: player sounds PLAYER - // on csqc: UNUSED +#ifdef COMPAT_XON010_CHANNELS +float CH_INFO = 0; // only on world and csqc +float CH_TRIGGER = 0; // only on players; compat: FALSELY CONTROLLED BY "Info" +float CH_WEAPON_A = 1; // only on players and entities +float CH_WEAPON_SINGLE = 5; // only on players and entities +float CH_VOICE = 2; // only on players +float CH_BGM_SINGLE = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice" +float CH_AMBIENT = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice" +float CH_TRIGGER_SINGLE = 3; // only on players, entities, csqc +float CH_SHOTS = 4; // only on players, entities, csqc +float CH_SHOTS_SINGLE = 4; // only on players, entities, csqc +float CH_WEAPON_B = 5; // only on players and entities +float CH_PAIN = 6; // only on players and csqc +float CH_PAIN_SINGLE = 6; // only on players and csqc +float CH_PLAYER = 7; // only on players and entities +float CH_TUBA = 5; // only on csqc +#else +float CH_INFO = 0; +float CH_TRIGGER = -3; +float CH_WEAPON_A = -1; +float CH_WEAPON_SINGLE = 1; +float CH_VOICE = -2; +float CH_BGM_SINGLE = 8; +float CH_AMBIENT = -9; +float CH_TRIGGER_SINGLE = 3; +float CH_SHOTS = -4; +float CH_SHOTS_SINGLE = 4; +float CH_WEAPON_B = -1; +float CH_PAIN = -6; +float CH_PAIN_SINGLE = 6; +float CH_PLAYER = -7; +float CH_TUBA = 5; +#endif float ATTN_NONE = 0; float ATTN_MIN = 0.015625; float ATTN_NORM = 0.5; +float ATTN_LARGE = 1; float ATTN_IDLE = 2; float ATTN_STATIC = 3; float ATTN_MAX = 3.984375; @@ -602,9 +594,6 @@ float HITTYPE_RESERVED = 0x1000; // unused yet #define FRAGS_PLAYER_NONSOLID -616 // we can use this frags value for both -//misc. stuff -#define NEWLINES "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n" - // water levels float WATERLEVEL_NONE = 0; float WATERLEVEL_WETFEET = 1; @@ -613,6 +602,19 @@ float WATERLEVEL_SUBMERGED = 3; float MAX_SHOT_DISTANCE = 32768; +//centerprint ID list +float CPID_TEAMCHANGE = 1; +float CPID_CTF_CAPTURESHIELD = 2; +float CPID_MINSTA_FINDAMMO = 3; +float CPID_NIX_WPNCHANGE = 4; +float CPID_DISCONNECT_IDLING = 5; +float CPID_ROUND_STARTING = 6; +float CPID_GAME_STARTING = 7; +float CPID_TIMEOUT_COUNTDOWN = 8; +float CPID_MOTD = 9; +float CPID_KH_MSG = 10; +float CPID_PREVENT_JOIN = 11; + // CSQC centerprint/notify message types float MSG_SUICIDE = 0; float MSG_KILL = 1; @@ -670,6 +672,7 @@ float WR_RESETPLAYER = 10; // (SVQC) does not need to do anything float WR_IMPACTEFFECT = 11; // (CSQC) impact effect float WR_SWITCHABLE = 12; // (CSQC) impact effect float WR_PLAYERDEATH = 13; // (SVQC) does not need to do anything +float WR_GONETHINK = 14; // (SVQC) logic to run every frame, also if no longer having the weapon as long as the switch away has not been performed float HUD_PANEL_WEAPONS = 0; float HUD_PANEL_AMMO = 1; @@ -687,7 +690,8 @@ float HUD_PANEL_CHAT = 12; float HUD_PANEL_ENGINEINFO = 13; float HUD_PANEL_INFOMESSAGES = 14; float HUD_PANEL_PHYSICS = 15; -float HUD_PANEL_NUM = 16; // always last panel id + 1, please increment when adding a new panel +float HUD_PANEL_CENTERPRINT = 16; +float HUD_PANEL_NUM = 17; // always last panel id + 1, please increment when adding a new panel string HUD_PANELNAME_WEAPONS = "weapons"; string HUD_PANELNAME_AMMO = "ammo"; @@ -705,8 +709,10 @@ string HUD_PANELNAME_CHAT = "chat"; string HUD_PANELNAME_ENGINEINFO = "engineinfo"; string HUD_PANELNAME_INFOMESSAGES = "infomessages"; string HUD_PANELNAME_PHYSICS = "physics"; +string HUD_PANELNAME_CENTERPRINT = "centerprint"; float HUD_MENU_ENABLE = 0; #define SERVERFLAG_ALLOW_FULLBRIGHT 1 #define SERVERFLAG_TEAMPLAY 2 +#define SERVERFLAG_PLAYERSTATS 4