From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Feb 2013 06:45:24 +0000 (-0500)
Subject: Fix some things with CTF
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~138
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a08e195a4fcafd6f2ff004aa31b84a9b40a34df;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some things with CTF
---

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 7de7f279e..9d42f17c9 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -334,7 +334,7 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
 	MSG_CENTER_NOTIF(1, CENTER_CTF_PICKUP_ENEMY_VERBOSE,		2, 0, "s1 s2 s1",		CPID_CTF_LOWPRIO,		"0 0", _("^BGThe %senemy (^BG%s%s)^BG got your flag! Retrieve it!"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_CTF_STALEMATE_CARRIER,			0, 0, "",				CPID_STALEMATE,			"0 0", _("^BGStalemate! Enemies can now see you on radar!"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_CTF_STALEMATE_OTHER,				0, 0, "",				CPID_STALEMATE,			"0 0", _("^BGStalemate! Flag carriers can now be seen by enemies on radar!"), "") \
-	MSG_CENTER_NOTIF(1, CENTER_CTF_FLAG_THROW_PUNISH,			0, 1, "f1",				CPID_CTF_LOWPRIO,		"0 0", _("^BGToo many flag throws! Throwing disabled for %s seconds."), "") \
+	MSG_CENTER_NOTIF(1, CENTER_CTF_FLAG_THROW_PUNISH,			0, 1, "f1secs",			CPID_CTF_LOWPRIO,		"0 0", _("^BGToo many flag throws! Throwing disabled for %s."), "") \
 	MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_CUSTOM,				2, 0, "s2",				NO_CPID,				"0 0", _("^K1You were %s"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_GENERIC,				0, 0, "",				NO_CPID,				"0 0", _("^K1You killed your own dumb self!"), _("^K1You need to be more careful!")) \
 	MSG_CENTER_NOTIF(1, CENTER_DEATH_SELF_VOID,					0, 0, "",				NO_CPID,				"0 0", _("^K1Watch your step!"), "") \
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 0ab8c7f9c..3714aa080 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -406,6 +406,7 @@ void ctf_Handle_Capture(entity flag, entity toucher, float capturetype)
 	if not(player) { return; } // without someone to give the reward to, we can't possibly cap
 	
 	// messages and sounds
+	Send_Notification(NOTIF_ONE, player, MSG_CENTER, APP_TEAM_ENT_2(enemy_flag, CENTER_CTF_CAPTURE_));
 	ctf_CaptureRecord(enemy_flag, player);
 	sound(player, CH_TRIGGER, flag.snd_flag_capture, VOL_BASE, ATTN_NONE);