From: Samual Lenks <samual@xonotic.org>
Date: Fri, 1 Mar 2013 21:28:24 +0000 (-0500)
Subject: Fix scan and start
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=efd51995dfdc23a469e8349ff72250df0f030e85;p=xonotic%2Fxonotic-data.pk3dir.git

Fix scan and start
---

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 6bf474e09..073df8c73 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -447,7 +447,7 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration,
 	MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_HELP,					0, 0, "",				CPID_KEYHUNT,			"0 0", _("^BGAll keys are in your team's hands!\nHelp the key carriers to meet!"), "") \
 	MULTITEAM_CENTER(1, CENTER_KEYHUNT_INTERFERE_, 4, 			0, 0, "",				CPID_KEYHUNT,			"0 0", _("^BGAll keys are in ^TC^TT team^BG's hands!\nInterfere ^F4NOW^BG!"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_MEET,					0, 0, "",				CPID_KEYHUNT,			"0 0", _("^BGAll keys are in your team's hands!\nMeet the other key carriers ^F4NOW^BG!"), "") \
-	MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_SCAN,					0, 0, "",				CPID_KEYHUNT_OTHER,		"0 0", _("^BGScanning frequency range..."), "") \
+	MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_SCAN,					0, 1, "",				CPID_KEYHUNT_OTHER,		"f1 0", _("^BGScanning frequency range..."), "") \
 	MULTITEAM_CENTER(1, CENTER_KEYHUNT_START_, 4,				0, 0, "",				CPID_KEYHUNT,			"0 0", _("^BGYou are starting with the ^TC^TT key"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_KEYHUNT_WAIT,					0, 4, "kh_teams",		CPID_KEYHUNT_OTHER,		"0 0", _("^BGWaiting for players to join...\nNeed active players for: %s"), "") \
 	MSG_CENTER_NOTIF(1, CENTER_LMS_CAMPCHECK,					0, 0, "",				CPID_LMS_CAMP,			"0 0", _("^F2Don't camp!"), "") \
diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc
index de12e76cb..5c357a205 100644
--- a/qcsrc/server/mutators/gamemode_keyhunt.qc
+++ b/qcsrc/server/mutators/gamemode_keyhunt.qc
@@ -746,7 +746,7 @@ void kh_Key_Spawn(entity initial_owner, float angle, float i)  // runs every tim
 	key.kh_worldkeynext = kh_worldkeylist;
 	kh_worldkeylist = key;
 
-	Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_ENT_4(key, CENTER_KEYHUNT_START_));
+	Send_Notification(NOTIF_ONE, initial_owner, MSG_CENTER, APP_TEAM_NUM_4(initial_owner.team, CENTER_KEYHUNT_START_));
 
 	WaypointSprite_Spawn("key-dropped", 0, 0, key, '0 0 1' * KH_KEY_WP_ZSHIFT, world, key.team, key, waypointsprite_attachedforcarrier, FALSE, RADARICON_FLAG, '0 1 1');
 	key.waypointsprite_attachedforcarrier.waypointsprite_visible_for_player = kh_Key_waypointsprite_visible_for_player;
@@ -913,7 +913,7 @@ void kh_StartRound()  // runs at the start of each round
 	}
 
 	kh_tracking_enabled = FALSE;
-	Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_KEYHUNT_SCAN);
+	Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_KEYHUNT_SCAN, autocvar_g_balance_keyhunt_delay_tracking);
 	kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_tracking, kh_EnableTrackingDevice);
 }