]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/common/deathtypes.qh
Blub- Error on line 1350, but file is only 1203 lines long?
[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / deathtypes.qh
index 35c7324947811564353c72e7c2d70c82c1b5270a..2549858d24d70d3872bbf3a3a6dace3f2109c410 100644 (file)
@@ -36,34 +36,32 @@ float DT_COUNT;
        DEATHTYPE(DEATH_TOUCHEXPLODE,                   DEATH_SELF_TOUCHEXPLODE,                        DEATH_MURDER_TOUCHEXPLODE,              NORMAL_POS) \
        DEATHTYPE(DEATH_CHEAT,                                  DEATH_SELF_CHEAT,                                       DEATH_MURDER_CHEAT,                     NORMAL_POS) \
        DEATHTYPE(DEATH_FIRE,                                   DEATH_SELF_FIRE,                                        DEATH_MURDER_FIRE,                              NORMAL_POS) \
-       DEATHTYPE(DEATH_VHCRUSH,                                NO_MSG,                                                         NO_MSG,                                                 DEATH_VHFIRST) \
-       DEATHTYPE(DEATH_SBMINIGUN,                              NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_SBROCKET,                               NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_SBBLOWUP,                               NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_WAKIGUN,                                NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_WAKIROCKET,                             NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_WAKIBLOWUP,                             NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_RAPTOR_CANNON,                  NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_RAPTOR_BOMB,                    NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_RAPTOR_BOMB_SPLIT,              NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_RAPTOR_DEATH,                   NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_BUMB_GUN,                               NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_BUMB_RAY,                               NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_BUMB_RAY_HEAL,                  NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_BUMB_DEATH,                             NO_MSG,                                                         NO_MSG,                                                 DEATH_VHLAST) \
-       DEATHTYPE(DEATH_TURRET,                                 NO_MSG,                                                         NO_MSG,                                                 DEATH_TURRET_FIRST) \
-       DEATHTYPE(DEATH_TURRET_EWHEEL,                  NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_FLAC,                    NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_MACHINEGUN,              NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_WALKER_GUN,              NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_WALKER_MEELE,    NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_WALKER_ROCKET,   NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_HELLION,                 NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_HK,                              NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_MLRS,                    NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_PLASMA,                  NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_PHASER,                  NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
-       DEATHTYPE(DEATH_TURRET_TESLA,                   NO_MSG,                                                         NO_MSG,                                                 DEATH_TURRET_LAST) \
+       DEATHTYPE(DEATH_VH_CRUSH,                               DEATH_SELF_VH_CRUSH,                            DEATH_MURDER_VH_CRUSH,                  DEATH_VHFIRST) \
+       DEATHTYPE(DEATH_VH_SPID_MINIGUN,                NO_MSG,                                                         DEATH_MURDER_VH_SPID_MINIGUN,   NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_SPID_ROCKET,                 DEATH_SELF_VH_SPID_ROCKET,                      DEATH_MURDER_VH_SPID_ROCKET,    NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_SPID_DEATH,                  DEATH_SELF_VH_SPID_DEATH,                       DEATH_MURDER_VH_SPID_DEATH,             NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_WAKI_GUN,                    NO_MSG,                                                         DEATH_MURDER_VH_WAKI_GUN,               NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_WAKI_ROCKET,                 DEATH_SELF_VH_WAKI_ROCKET,                      DEATH_MURDER_VH_WAKI_ROCKET,    NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_WAKI_DEATH,                  DEATH_SELF_VH_WAKI_DEATH,                       DEATH_MURDER_VH_WAKI_DEATH,             NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_RAPT_CANNON,                 NO_MSG,                                                         DEATH_MURDER_VH_RAPT_CANNON,    NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_RAPT_BOMB,                   DEATH_SELF_VH_RAPT_BOMB,                        DEATH_MURDER_VH_RAPT_BOMB,              NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_RAPT_FRAGMENT,               DEATH_SELF_VH_RAPT_BOMB,                        DEATH_MURDER_VH_RAPT_BOMB,              NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_RAPT_DEATH,                  DEATH_SELF_VH_RAPT_DEATH,                       DEATH_MURDER_VH_RAPT_DEATH,             NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_BUMB_GUN,                    NO_MSG,                                                         DEATH_MURDER_VH_BUMB_GUN,               NORMAL_POS) \
+       DEATHTYPE(DEATH_VH_BUMB_DEATH,                  DEATH_SELF_VH_BUMB_DEATH,                       DEATH_MURDER_VH_BUMB_DEATH,             DEATH_VHLAST) \
+       DEATHTYPE(DEATH_TURRET,                                 DEATH_SELF_TURRET,                                      NO_MSG,                                                 DEATH_TURRET_FIRST) \
+       DEATHTYPE(DEATH_TURRET_EWHEEL,                  DEATH_SELF_TURRET_EWHEEL,                       NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_FLAC,                    DEATH_SELF_TURRET_FLAC,                         NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_MACHINEGUN,              DEATH_SELF_TURRET_MACHINEGUN,           NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_WALK_GUN,                DEATH_SELF_TURRET_WALK_GUN,                     NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_WALK_MEELE,              DEATH_SELF_TURRET_WALK_MEELE,           NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_WALK_ROCKET,             DEATH_SELF_TURRET_WALK_ROCKET,          NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_HELLION,                 DEATH_SELF_TURRET_HELLION,                      NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_HK,                              DEATH_SELF_TURRET_HK,                           NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_MLRS,                    DEATH_SELF_TURRET_MLRS,                         NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_PLASMA,                  DEATH_SELF_TURRET_PLASMA,                       NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_PHASER,                  DEATH_SELF_TURRET_PHASER,                       NO_MSG,                                                 NORMAL_POS) \
+       DEATHTYPE(DEATH_TURRET_TESLA,                   DEATH_SELF_TURRET_TESLA,                        NO_MSG,                                                 DEATH_TURRET_LAST) \
        DEATHTYPE(DEATH_GENERIC,                                DEATH_SELF_GENERIC,                             NO_MSG,                                                 NORMAL_POS) \
        DEATHTYPE(DEATH_WEAPON,                                 NO_MSG,                                                         NO_MSG,                                                 NORMAL_POS) \
        DEATHTYPE(DEATH_CUSTOM,                                 DEATH_SELF_CUSTOM,                                      NO_MSG,                                                 NORMAL_POS)
@@ -97,51 +95,5 @@ float DEATH_HITTYPEMASK = 0x1F00; // which is WAY below 10000 used for normal de
 float HITTYPE_SECONDARY = 0x100;
 float HITTYPE_SPLASH = 0x200; // automatically set by RadiusDamage
 float HITTYPE_BOUNCE = 0x400;
-float HITTYPE_HEADSHOT = 0x800; // automatically set by Damage (if headshotbonus is set)
+float HITTYPE_RESERVED2 = 0x800;
 float HITTYPE_RESERVED = 0x1000; // unused yet
-
-// CSQC centerprint/notify message types
-float MSG_SUICIDE = 0;
-float MSG_KILL = 1;
-float MSG_SPREE = 2;
-float MSG_KILL_ACTION = 3;
-float MSG_KILL_ACTION_SPREE = 4;
-float MSG_INFO = 5;
-float MSG_KA = 6;
-float MSG_RACE = 10;
-
-float KILL_TEAM_RED = 12001;
-float KILL_TEAM_BLUE = 12002;
-float KILL_TEAM_SPREE = 12003;
-float KILL_FIRST_BLOOD = 12004;
-float KILL_FIRST_VICTIM = 12005;
-float KILL_TYPEFRAG = 12006;
-float KILL_TYPEFRAGGED = 12007;
-float KILL_FRAG = 12008;
-float KILL_FRAGGED = 12009;
-float KILL_SPREE = 12010;
-float KILL_END_SPREE = 12011;
-float KILL_SPREE_3 = 12012;
-float KILL_SPREE_5 = 12013;
-float KILL_SPREE_10 = 12014;
-float KILL_SPREE_15 = 12015;
-float KILL_SPREE_20 = 12016;
-float KILL_SPREE_25 = 12017;
-float KILL_SPREE_30 = 12018;
-
-
-
-// this shit has got to go
-float INFO_GOTFLAG = 13001;
-float INFO_PICKUPFLAG = 13002;
-float INFO_LOSTFLAG = 13003;
-float INFO_RETURNFLAG = 13004;
-float INFO_CAPTUREFLAG = 13005;
-
-float KA_PICKUPBALL = 14001;
-float KA_DROPBALL = 14002;
-
-float RACE_SERVER_RECORD = 15001;
-float RACE_NEW_TIME = 15002;
-float RACE_NEW_RANK = 15003;
-float RACE_FAIL = 15004;