X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fconstants.qh;h=de486577bd022513c06ec886552e9287459a72bb;hp=4997815800d414db43fdac46f860e60bad1b3d5d;hb=44effb3a66f8b44d05106ff361ef5fc126fef03b;hpb=d6e28649890360b4f45f4155be248ad038e4a73b diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 499781580..de486577b 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -83,6 +83,7 @@ const float RANKINGS_CNT = 15; const float CSQC_KILLNOTIFY = 0; const float CSQC_CENTERPRINT = 1; +const float CSQC_CENTERPRINT_GENERIC = 2; const float ENT_CLIENT = 0; const float ENT_CLIENT_DEAD = 1; @@ -429,74 +430,38 @@ 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! -#ifdef XON020_CHANNELS +#ifdef COMPAT_XON010_CHANNELS float CH_INFO = 0; // only on world and csqc -float CH_ITEMS = 0; // only on players +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_AMBIENT = 2; // only on entities -float CH_BGM = 2; // only on csqc -float CH_TRIGGERS_SINGLE = 3; // only on players, entities, csqc +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 #else float CH_INFO = 0; -float CH_TRIGGERS_SINGLE = 3; +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_ITEMS = 256; -float CH_WEAPON_A = 257; -float CH_VOICE = 258; -float CH_AMBIENT = 259; -float CH_BGM = 260; -float CH_WEAPON_B = 257; -float CH_PAIN = 262; -float CH_PLAYER = 263; +float CH_WEAPON_B = -1; +float CH_PAIN = -6; +float CH_PAIN_SINGLE = 6; +float CH_PLAYER = -7; #endif -// 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 - float ATTN_NONE = 0; float ATTN_MIN = 0.015625; float ATTN_NORM = 0.5; @@ -629,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; @@ -640,6 +602,18 @@ 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; + // CSQC centerprint/notify message types float MSG_SUICIDE = 0; float MSG_KILL = 1; @@ -714,7 +688,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"; @@ -732,6 +707,7 @@ 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;