X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fconstants.qh;h=5ebeb54659e4ba7e936c0666077f967fa5cd22b5;hb=aaf697e6f12d23c7d7d75f352f7703f2c8491485;hp=775628e06871c5302191dadc321afa52c6e2651d;hpb=3233dc7af731e4894176b9a317b09ff19090eb21;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 775628e06..5ebeb5465 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -59,6 +59,8 @@ 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_CAMPINGRIFLE_SCOPE = 115; +const float TE_CSQC_NEX_SCOPE = 116; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; @@ -105,6 +107,9 @@ const float ENT_CLIENT_TUBANOTE = 23; const float ENT_CLIENT_WARPZONE = 24; const float ENT_CLIENT_WARPZONE_CAMERA = 25; const float ENT_CLIENT_TRIGGER_MUSIC = 26; +const float ENT_CLIENT_HOOK = 27; +const float ENT_CLIENT_LGBEAM = 28; +const float ENT_CLIENT_GAUNTLET = 29; const float ENT_CLIENT_TURRET = 40; @@ -393,7 +398,7 @@ float CHAN_AUTO = 0; // on world: announcers, ... INFO // on players: item pickup ITEMS // on entities: UNUSED - // on csqc: UNUSED + // on csqc: announcers INFO float CHAN_WEAPON = 1; // Weapon fire // on world: UNUSED // on players: weapon firing WEAPONS @@ -408,7 +413,7 @@ float CHAN_TRIGGER = 3; // Triggers/Items // on world: UNUSED // on players: item pickup ITEMS // on entities: platforms moving etc. ITEMS - // on csqc: UNUSED + // on csqc: platforms moving etc. ITEMS float CHAN_PROJECTILE = 4; // Projectiles // on world: UNUSED // on players: projectiles hitting player SHOTS @@ -591,8 +596,8 @@ float WR_RESETPLAYER = 10; // (SVQC) does not need to do anything float WR_IMPACTEFFECT = 11; // (CSQC) impact effect -float HUD_PANEL_WEAPONICONS = 0; -float HUD_PANEL_INVENTORY = 1; +float HUD_PANEL_WEAPONS = 0; +float HUD_PANEL_AMMO = 1; float HUD_PANEL_POWERUPS = 2; float HUD_PANEL_HEALTHARMOR = 3; float HUD_PANEL_NOTIFY = 4; @@ -608,8 +613,8 @@ float HUD_PANEL_ENGINEINFO = 13; float HUD_PANEL_INFOMESSAGES = 14; float HUD_PANEL_NUM = 15; // always last panel id + 1, please increment when adding a new panel -string HUD_PANELNAME_WEAPONICONS = "weaponicons"; -string HUD_PANELNAME_INVENTORY = "inventory"; +string HUD_PANELNAME_WEAPONS = "weapons"; +string HUD_PANELNAME_AMMO = "ammo"; string HUD_PANELNAME_POWERUPS = "powerups"; string HUD_PANELNAME_HEALTHARMOR = "healtharmor"; string HUD_PANELNAME_NOTIFY = "notify";