From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Feb 2013 07:24:49 +0000 (-0500)
Subject: Take out some more old trash
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~136
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d1b54c8db8cb42459aa0b2b8bf58b461e861c00f;p=xonotic%2Fxonotic-data.pk3dir.git

Take out some more old trash
---

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index c24778b95..44c5c572a 100644
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1197,10 +1197,6 @@ float CSQC_Parse_TempEntity()
 			Announcer_Play(ReadString());
 			bHandled = true;
 			break;
-		case TE_CSQC_KILLNOTIFY:
-			HUD_KillNotify(ReadString(), ReadString(), ReadString(), ReadShort(), ReadByte());
-			bHandled = true;
-			break;
 		case TE_CSQC_CENTERPRINT_GENERIC:
 			float id;
 			string s;
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 015a83ca1..6a7b65954 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1619,432 +1619,6 @@ string Weapon_KillMessage(float deathtype)
 	return w_deathtypestring;
 }
 
-
-void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s1 = attacker, s2 = victim
-{
-	/*
-	float w;
-	float alsoprint, gentle;
-	alsoprint = (autocvar_hud_panel_notify_print || !panel_enabled); // print message to console if: notify panel disabled, or cvar to do so enabled
-	gentle = (autocvar_cl_gentle || autocvar_cl_gentle_messages);
-	
-	if ((msg == MSG_SUICIDE || msg == MSG_KILL || msg == MSG_KILL_ACTION) && gametype == MAPINFO_TYPE_CTS) // selfkill isn't interesting in CTS and only spams up the notify panel
-		return;
-
-	if(msg == MSG_SUICIDE) {
-		w = DEATH_WEAPONOF(type);
-		if(WEP_VALID(w)) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if (alsoprint)
-				print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n");
-		} else if (type == DEATH_KILL) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 couldn't take it anymore\n"), s1));
-		} else if (type == DEATH_ROT) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 died\n"), s1));
-		} else if (type == DEATH_NOAMMO) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO);
-			if (alsoprint)
-				print (sprintf(_("^7%s^7 committed suicide. What's the point of living without ammo?\n"), s1));
-		} else if (type == DEATH_CAMP) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 thought they found a nice camping ground\n"), s1));
-		} else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
-			HUD_KillNotify_Push(s1, "", 0, type);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 didn't become friends with the Lord of Teamplay\n"), s1));
-		} else if (type == DEATH_CHEAT) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 unfairly eliminated themself\n"), s1));
-		} else if (type == DEATH_FIRE) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 burned to death\n"), s1));
-		} else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if (alsoprint)
-				print (sprintf(_("^1%s^1 couldn't resist the urge to self-destruct\n"), s1));
-		} 
-		
-		if (stof(s2) > 2) // killcount > 2
-			print (sprintf(_("^1%s^1 ended it all after a %d kill spree\n"), s1, stof(s2)));
-	} else if(msg == MSG_KILL) {
-		w = DEATH_WEAPONOF(type);
-		if(WEP_VALID(w)) {
-			HUD_KillNotify_Push(s1, s2, 1, type);
-			if (alsoprint)
-				print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer
-		}
-		else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
-			HUD_KillNotify_Push(s1, s2, 1, type);
-			if(alsoprint)
-			{
-				if(gentle) {
-					print (sprintf(_("^1%s^1 took action against a team mate\n"), s1));
-				} else {
-					print (sprintf(_("^1%s^1 mows down a team mate\n"), s1));
-				}
-			}
-			if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
-				if(gentle)
-					print (sprintf(_("^1%s^1 ended a %d scoring spree by going against a team mate\n"), s1, stof(s3)));
-				else
-					print (sprintf(_("^1%s^1 ended a %d kill spree by killing a team mate\n"), s1, stof(s3)));
-			}
-			else if (stof(s2) > 2) {
-				if(gentle)
-					print (sprintf(_("^1%s^1's %s scoring spree was ended by a team mate!\n"), s1, stof(s3)));
-				else
-					print (sprintf(_("^1%s^1's %s kill spree was ended by a team mate!\n"), s1, stof(s3)));
-			}
-		}
-		else if(type == KILL_FIRST_BLOOD)
-			print(sprintf(_("^1%s^1 drew first blood\n"), s1));
-		else if (type == DEATH_TELEFRAG) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_TELEFRAG);
-			if(gentle)
-				print (sprintf(_("^1%s^1 tried to occupy %s^1's teleport destination space\n"), s2, s1));
-			else
-				print (sprintf(_("^1%s^1 was telefragged by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_DROWN) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_DROWN);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was drowned by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_SLIME) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_SLIME);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was slimed by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_LAVA) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_LAVA);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was cooked by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_FALL) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_FALL);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was grounded by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_SHOOTING_STAR) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_SHOOTING_STAR);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was shot into space by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_SWAMP) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was conserved by %s\n"), s2, s1));
-		}
-		else if (type == DEATH_HURTTRIGGER)
-		{
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_HURTTRIGGER);
-			if(alsoprint)
-				print(sprintf(_("^1%s^1 was thrown into a world of hurt by %s\n"), s2, s1));
-		} else if(type == DEATH_VHCRUSH) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was crushed by %s\n"), s2, s1));
-		} else if(type == DEATH_SBMINIGUN) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 got shredded by %s\n"), s2, s1));
-		} else if(type == DEATH_SBROCKET) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was blasted to bits by %s\n"), s2, s1));
-		} else if(type == DEATH_SBBLOWUP) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1));
-		} else if(type == DEATH_WAKIGUN) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was bolted down by %s\n"), s2, s1));
-		} else if(type == DEATH_BUMB_GUN) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 saw %s's preddy lights.\n"), s2, s1));
-		} else if(type == DEATH_WAKIROCKET) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 could find no shelter from %s^1's rockets\n"), s2, s1));
-		} else if(type == DEATH_WAKIBLOWUP) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1));
-		} else if(type == DEATH_RAPTOR_CANNON) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 nailed to hell by %s\n"), s2, s1));
-		} else if(type == DEATH_RAPTOR_BOMB) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 cluster crushed by %s\n"), s2, s1));
-		} else if(type == DEATH_RAPTOR_DEATH) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 got caught in the blast when %s^1's destroys a vehicle\n"), s2, s1));
-		} else if(type == DEATH_TURRET) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was pushed into the line of fire by %s\n"), s2, s1));
-		} else if(type == DEATH_TOUCHEXPLODE) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was pushed into an accident by %s\n"), s2, s1));
-		} else if(type == DEATH_CHEAT) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was unfairly eliminated by %s\n"), s2, s1));
-		} else if (type == DEATH_FIRE) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was burnt to death by %s\n"), s2, s1));
-		} else if (type == DEATH_CUSTOM) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_CUSTOM);
-			if(alsoprint)
-				print("^1", sprintf(s3, strcat(s2, "^1"), strcat(s1, "^1")), "\n");
-		} else if (type == DEATH_HURTTRIGGER) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_HURTTRIGGER);
-			if(alsoprint)
-				print("^1", sprintf(s3, strcat(s2, "^1"), strcat(s1, "^1")), "\n");
-		} else {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was fragged by %s\n"), s2, s1));
-		}
-	} else if(msg == MSG_SPREE) {
-		if(type == KILL_END_SPREE) {
-			if(gentle)
-				print (sprintf(_("^1%s^1's %s scoring spree was ended by %s\n"), s1, s2, s3));
-			else
-				print (sprintf(_("^1%s^1's %s kill spree was ended by %s\n"), s1, s2, s3));
-		} else if(type == KILL_SPREE) {
-			if(gentle)
-				print (sprintf(_("^1%s^1 made %s scores in a row\n"), s1, s2));
-			else
-				print (sprintf(_("^1%s^1 has %s frags in a row\n"), s1, s2));
-		} else if(type == KILL_SPREE_3) {
-			if(gentle)
-				print (sprintf(_("%s^7 made a ^1TRIPLE SCORE\n"), s1));
-			else
-				print (sprintf(_("%s^7 made a ^1TRIPLE FRAG\n"), s1));
-		} else if(type == KILL_SPREE_5) {
-			if(gentle)
-				print (sprintf(_("%s^7 unleashes ^1SCORING RAGE\n"), s1));
-			else
-				print (sprintf(_("%s^7 unleashes ^1RAGE\n"), s1));
-		} else if(type == KILL_SPREE_10) {
-			if(gentle)
-				print (sprintf(_("%s^7 made ^1TEN SCORES IN A ROW!\n"), s1));
-			else
-				print (sprintf(_("%s^7 starts the ^1MASSACRE!\n"), s1));
-		} else if(type == KILL_SPREE_15) {
-			if(gentle)
-				print (sprintf(_("%s^7 made ^1FIFTEEN SCORES IN A ROW!\n"), s1));
-			else
-				print (sprintf(_("%s^7 executes ^1MAYHEM!\n"), s1));
-		} else if(type == KILL_SPREE_20) {
-			if(gentle)
-				print (sprintf(_("%s^7 made ^1TWENTY SCORES IN A ROW!\n"), s1));
-			else
-				print (sprintf(_("%s^7 is a ^1BERSERKER!\n"), s1));
-		} else if(type == KILL_SPREE_25) {
-			if(gentle)
-				print (sprintf(_("%s^7 made ^1TWENTY FIVE SCORES IN A ROW!\n"), s1));
-			else
-				print (sprintf(_("%s^7 inflicts ^1CARNAGE!\n"), s1));
-		} else if(type == KILL_SPREE_30) {
-			if(gentle)
-				print (sprintf(_("%s^7 made ^1THIRTY SCORES IN A ROW!\n"), s1));
-			else
-				print (sprintf(_("%s^7 unleashes ^1ARMAGEDDON!\n"), s1));
-		}
-	} else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
-		if (type == DEATH_DROWN) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_DROWN);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 was in the water for too long\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 drowned\n"), s1));
-			}
-		} else if (type == DEATH_SLIME) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_SLIME);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was slimed\n"), s1));
-		} else if (type == DEATH_LAVA) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_LAVA);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 found a hot place\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 turned into hot slag\n"), s1));
-			}
-		} else if (type == DEATH_FALL) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 tested gravity (and it worked)\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 hit the ground with a crunch\n"), s1));
-			}
-		} else if (type == DEATH_SHOOTING_STAR) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_SHOOTING_STAR);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 became a shooting star\n"), s1));
-		} else if (type == DEATH_SWAMP) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 discovered a swamp\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 is now conserved for centuries to come\n"), s1));
-			}
-		} else if(DEATH_ISTURRET(type)) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 ran into a turret\n"), s1));
-				else
-				{
-					switch(type)
-					{
-						case DEATH_TURRET_EWHEEL:
-							print (sprintf(_("^1%s^1 was laserd down by a eWheel turret \n"), s1));
-							break;
-						case DEATH_TURRET_FLAC:
-							print (sprintf(_("^1%s^1 got caught in the flac \n"), s1));
-							break;
-						case DEATH_TURRET_MACHINEGUN:
-							print (sprintf(_("^1%s^1 was riddeld full of riddled by a machinegun turret \n"), s1));
-							break;
-						case DEATH_TURRET_WALKER_GUN:
-							print (sprintf(_("^1%s^1 got served a led enrichment by a walker turret \n"), s1));
-							break;
-						case DEATH_TURRET_WALKER_MEELE:
-							print (sprintf(_("^1%s^1 was impaled by a walker turret \n"), s1));
-							break;
-						case DEATH_TURRET_WALKER_ROCKET:
-							print (sprintf(_("^1%s^1 was rocketed to hell by a walker turret \n"), s1));
-							break;
-						case DEATH_TURRET_HELLION:
-							print (sprintf(_("^1%s^1 was blasted away hellion turret \n"), s1));
-							break;
-						case DEATH_TURRET_HK:
-							print (sprintf(_("^1%s^1 could not hide from the hunter turret \n"), s1));
-							break;
-						case DEATH_TURRET_MLRS:
-							print (sprintf(_("^1%s^1 got turned into smoldering gibs by a mlrs turret \n"), s1));
-							break;
-						case DEATH_TURRET_PLASMA:
-							print (sprintf(_("^1%s^1 got served some superheated plasma from a plasma turret \n"), s1));
-							break;
-						case DEATH_TURRET_PHASER:
-							print (sprintf(_("^1%s^1 was phased out \n"), s1));
-							break;
-						case DEATH_TURRET_TESLA:			
-							print (sprintf(_("^1%s^1 was electrocuted by a tesla turret \n"), s1));
-							break;
-					}
-				}
-			}
-		} else if (type == DEATH_CUSTOM) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_CUSTOM);
-			if(alsoprint)
-				print("^1", sprintf(s2, strcat(s1, "^1")), "\n");
-		} else if (type == DEATH_HURTTRIGGER) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_HURTTRIGGER);
-			if(alsoprint)
-				print("^1", sprintf(s2, strcat(s1, "^1")), "\n");
-		} else if(type == DEATH_TOUCHEXPLODE) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 died in an accident\n"), s1));
-		} else if(type == DEATH_CHEAT) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-				print (sprintf(_("^1%s^1 was unfairly eliminated\n"), s1));
-		} else if(type == DEATH_FIRE) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 felt a little hot\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 burnt to death\n"), s1));
-				}
-		} else {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
-			if(alsoprint)
-			{
-				if(gentle)
-					print (sprintf(_("^1%s^1 needs a restart\n"), s1));
-				else
-					print (sprintf(_("^1%s^1 died\n"), s1));
-			}
-		}
-	} else if(msg == MSG_KILL_ACTION_SPREE) {
-		if(gentle)
-			print (sprintf(_("^1%s^1 needs a restart after a %d scoring spree\n"), s1, stof(s2)));
-		else
-			print (sprintf(_("^1%s^1 died with a %d kill spree\n"), s1, stof(s2)));
-	} else if(msg == MSG_INFO) {
-		if(type == INFO_GOTFLAG) { // here, s2 is the flag name
-			HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
-			print(sprintf(_("%s^7 got the %s\n"), s1, s2));
-		} else if(type == INFO_LOSTFLAG) {
-			HUD_KillNotify_Push(s1, s2, 0, INFO_LOSTFLAG);
-			print(sprintf(_("%s^7 lost the %s\n"), s1, s2));
-		} else if(type == INFO_PICKUPFLAG) {
-			HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
-			print(sprintf(_("%s^7 picked up the %s\n"), s1, s2));
-		} else if(type == INFO_RETURNFLAG) {
-			HUD_KillNotify_Push(s1, s2, 0, INFO_RETURNFLAG);
-			print(sprintf(_("%s^7 returned the %s\n"), s1, s2));
-		} else if(type == INFO_CAPTUREFLAG) {
-			HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG);
-			print(sprintf(_("%s^7 captured the %s%s\n"), s1, s2, s3));
-		}
-	} else if(msg == MSG_RACE) {
-		if(type == RACE_SERVER_RECORD) {
-			HUD_KillNotify_Push(s1, s2, 1, RACE_SERVER_RECORD);
-		}
-		else if(type == RACE_NEW_RANK) {
-			HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_RANK);
-		}
-		else if(type == RACE_NEW_TIME) {
-			HUD_KillNotify_Push(s1, s2, 1, RACE_NEW_TIME);
-		}
-		else if(type == RACE_FAIL) {
-			HUD_KillNotify_Push(s1, s2, 1, RACE_FAIL);
-		}
-	} else if(msg == MSG_KA) {
-		if(type == KA_PICKUPBALL) {
-			HUD_KillNotify_Push(s1, s2, 0, KA_PICKUPBALL);
-			if(alsoprint)
-				print (sprintf(_("%s^7 has picked up the ball!\n"), s1));
-		}
-		else if(type == KA_DROPBALL) {
-			HUD_KillNotify_Push(s1, s2, 0, KA_DROPBALL);
-			if(alsoprint)
-				print(sprintf(_("%s^7 has dropped the ball!\n"), s1));
-		}
-	}*/
-}
-
 void HUD_Notify_Push(string icon, string attacker, string victim)
 {
 	if(icon != "")
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index a2562bc18..e4d00825a 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -38,14 +38,13 @@ 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_CENTERPRINT_GENERIC = 112;
+const float TE_CSQC_WEAPONCOMPLAIN = 113;
+const float TE_CSQC_NEX_SCOPE = 114;
+const float TE_CSQC_MINELAYER_MAXMINES = 115;
+const float TE_CSQC_HAGAR_MAXROCKETS = 116;
+const float TE_CSQC_VEHICLESETUP = 117;
+const float TE_CSQC_SVNOTICE = 118;
 
 const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
 const float RACE_NET_CHECKPOINT_CLEAR = 1;