X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fconstants.qh;h=b399f3857c3454e3c16572d0aed19a7aea627801;hp=6dc75e42efc0ba09554ff9a515c182641301cc3e;hb=cdc5a2a10c0779eb8028c83070fcd468a1441842;hpb=80ea2c26461cab2b2992f79643eaf59aacb7cda7 diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 6dc75e42e..b399f3857 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -30,22 +30,18 @@ const float AS_FLOAT = 8; const float TE_CSQC_PICTURE = 100; const float TE_CSQC_RACE = 101; -const float TE_CSQC_SPAWN = 102; -const float TE_CSQC_ZCURVEPARTICLES = 103; -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_ANNOUNCE = 110; -const float TE_CSQC_TARGET_MUSIC = 111; -const float TE_CSQC_KILLNOTIFY = 112; -const float TE_CSQC_CENTERPRINT_GENERIC = 113; -const float TE_CSQC_WEAPONCOMPLAIN = 114; -const float TE_CSQC_NEX_SCOPE = 115; -const float TE_CSQC_MINELAYER_MAXMINES = 116; -const float TE_CSQC_HAGAR_MAXROCKETS = 117; -const float TE_CSQC_VEHICLESETUP = 118; -const float TE_CSQC_SVNOTICE = 119; +const float TE_CSQC_ZCURVEPARTICLES = 102; +const float TE_CSQC_NEXGUNBEAMPARTICLE = 103; +const float TE_CSQC_LIGHTNINGARC = 104; +const float TE_CSQC_TEAMNAGGER = 105; +const float TE_CSQC_PINGPLREPORT = 106; +const float TE_CSQC_TARGET_MUSIC = 107; +const float TE_CSQC_WEAPONCOMPLAIN = 108; +const float TE_CSQC_NEX_SCOPE = 109; +const float TE_CSQC_MINELAYER_MAXMINES = 110; +const float TE_CSQC_HAGAR_MAXROCKETS = 111; +const float TE_CSQC_VEHICLESETUP = 112; +const float TE_CSQC_SVNOTICE = 113; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; @@ -98,7 +94,9 @@ const float ENT_CLIENT_WARPZONE_TELEPORTED = 32; const float ENT_CLIENT_MODEL = 33; const float ENT_CLIENT_ITEM = 34; const float ENT_CLIENT_BUMBLE_RAYGUN = 35; -const float ENT_CLIENT_NOTIFICATION = 36; +const float ENT_CLIENT_SPAWNPOINT = 36; +const float ENT_CLIENT_SPAWNEVENT = 37; +const float ENT_CLIENT_NOTIFICATION = 38; const float ENT_CLIENT_TURRET = 40; const float ENT_CLIENT_AUXILIARYXHAIR = 50; @@ -180,6 +178,7 @@ const float STAT_SECRETS_TOTAL = 70; const float STAT_SECRETS_FOUND = 71; const float STAT_RESPAWN_TIME = 72; +const float STAT_ROUNDSTARTTIME = 73; // mod stats (1xx) const float STAT_REDALIVE = 100; @@ -378,19 +377,6 @@ 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; - // weapon requests float WR_SETUP = 1; // (SVQC) setup weapon data float WR_THINK = 2; // (SVQC) logic to run every frame @@ -398,8 +384,8 @@ float WR_CHECKAMMO1 = 3; // (SVQC) checks ammo for weapon float WR_CHECKAMMO2 = 4; // (SVQC) checks ammo for weapon float WR_AIM = 5; // (SVQC) runs bot aiming code for this weapon float WR_PRECACHE = 6; // (CSQC and SVQC) precaches models/sounds used by this weapon -float WR_SUICIDEMESSAGE = 7; // (CSQC) sets w_deathtypestring or leaves it alone (and may inspect w_deathtype for details) -float WR_KILLMESSAGE = 8; // (CSQC) sets w_deathtypestring or leaves it alone +float WR_SUICIDEMESSAGE = 7; // (SVQC) notification number for suicide message (may inspect w_deathtype for details) +float WR_KILLMESSAGE = 8; // (SVQC) notification number for kill message (may inspect w_deathtype for details) float WR_RELOAD = 9; // (SVQC) does not need to do anything float WR_RESETPLAYER = 10; // (SVQC) does not need to do anything float WR_IMPACTEFFECT = 11; // (CSQC) impact effect @@ -407,43 +393,6 @@ 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; -float HUD_PANEL_POWERUPS = 2; -float HUD_PANEL_HEALTHARMOR = 3; -float HUD_PANEL_NOTIFY = 4; -float HUD_PANEL_TIMER = 5; -float HUD_PANEL_RADAR = 6; -float HUD_PANEL_SCORE = 7; -float HUD_PANEL_RACETIMER = 8; -float HUD_PANEL_VOTE = 9; -float HUD_PANEL_MODICONS = 10; -float HUD_PANEL_PRESSEDKEYS = 11; -float HUD_PANEL_CHAT = 12; -float HUD_PANEL_ENGINEINFO = 13; -float HUD_PANEL_INFOMESSAGES = 14; -float HUD_PANEL_PHYSICS = 15; -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"; -string HUD_PANELNAME_POWERUPS = "powerups"; -string HUD_PANELNAME_HEALTHARMOR = "healtharmor"; -string HUD_PANELNAME_NOTIFY = "notify"; -string HUD_PANELNAME_TIMER = "timer"; -string HUD_PANELNAME_RADAR = "radar"; -string HUD_PANELNAME_SCORE = "score"; -string HUD_PANELNAME_RACETIMER = "racetimer"; -string HUD_PANELNAME_VOTE = "vote"; -string HUD_PANELNAME_MODICONS = "modicons"; -string HUD_PANELNAME_PRESSEDKEYS = "pressedkeys"; -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"; - #define SERVERFLAG_ALLOW_FULLBRIGHT 1 #define SERVERFLAG_TEAMPLAY 2 #define SERVERFLAG_PLAYERSTATS 4