X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fdeathtypes.qh;h=ce3c690af8496d9cb55adc0fb1222cf2983792fd;hb=f1325bbe6f5d02406f4a745b7a40889a5285e21a;hp=9ab862eba071cc7f8e06486b8355c2a40bd8f290;hpb=ab3a745fb54223ba95fa15b79b734696329eba91;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/deathtypes.qh b/qcsrc/common/deathtypes.qh
index 9ab862eba..ce3c690af 100644
--- a/qcsrc/common/deathtypes.qh
+++ b/qcsrc/common/deathtypes.qh
@@ -36,28 +36,26 @@ 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_VH_CRUSH,				NO_MSG, 							DEATH_MURDER_VH_CRUSH,			DEATH_VHFIRST) \
+	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,			NO_MSG, 							DEATH_MURDER_VH_SPID_ROCKET,	NORMAL_POS) \
-	DEATHTYPE(DEATH_VH_SPID_DEATH,			NO_MSG, 							DEATH_MURDER_VH_SPID_DEATH,		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,			NO_MSG, 							DEATH_MURDER_VH_WAKI_ROCKET,		NORMAL_POS) \
-	DEATHTYPE(DEATH_VH_WAKI_DEATH,			NO_MSG, 							DEATH_MURDER_VH_WAKI_DEATH,		NORMAL_POS) \
+	DEATHTYPE(DEATH_VH_WAKI_ROCKET,			NO_MSG, 							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,			NO_MSG, 							DEATH_MURDER_VH_RAPT_BOMB,		NORMAL_POS) \
 	DEATHTYPE(DEATH_VH_RAPT_FRAGMENT,		NO_MSG, 							DEATH_MURDER_VH_RAPT_FRAGMENT,	NORMAL_POS) \
-	DEATHTYPE(DEATH_VH_RAPT_DEATH,			NO_MSG, 							DEATH_MURDER_VH_RAPT_DEATH,		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_RAY,			NO_MSG, 							DEATH_MURDER_VH_BUMB_RAY,		NORMAL_POS) \
-	DEATHTYPE(DEATH_VH_BUMB_RAY_HEAL,		NO_MSG, 							DEATH_MURDER_VH_BUMB_RAY_HEAL,	NORMAL_POS) \
-	DEATHTYPE(DEATH_VH_BUMB_DEATH,			NO_MSG, 							DEATH_MURDER_VH_BUMB_DEATH,		DEATH_VHLAST) \
+	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_WALKER_GUN,		DEATH_SELF_TURRET_WALKER_GUN,		NO_MSG, 						NORMAL_POS) \
-	DEATHTYPE(DEATH_TURRET_WALKER_MEELE,	DEATH_SELF_TURRET_WALKER_MEELE,		NO_MSG, 						NORMAL_POS) \
-	DEATHTYPE(DEATH_TURRET_WALKER_ROCKET,	DEATH_SELF_TURRET_WALKER_ROCKET,	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) \