X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fannouncer.qc;h=62b732bec25034e773801113d86aa9f268bfcbf4;hb=f4c77946d2b388b2ef4fae1057d1a636d9850923;hp=e5fd7d575f643a7e9c7f940c62f8eec94c2b82a5;hpb=490a31934aa67cc7de5299a4d3f625d5271f8583;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index e5fd7d575..62b732bec 100644
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -11,7 +11,7 @@ string AnnouncerOption()
 {
 	string ret = autocvar_cl_announcer;
 	MUTATOR_CALLHOOK(AnnouncerOption, ret);
-	ret = ret_string;
+	ret = M_ARGV(0, string);
 	return ret;
 }
 
@@ -24,7 +24,7 @@ void Announcer_Countdown(entity this)
 	if(roundstarttime == -1)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
-		remove(this);
+		delete(this);
 		announcer_countdown = NULL;
 		return;
 	}
@@ -40,7 +40,7 @@ void Announcer_Countdown(entity this)
 	{
 		Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN);
 		Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
-		remove(this);
+		delete(this);
 		announcer_countdown = NULL;
 		return;
 	}
@@ -58,7 +58,7 @@ void Announcer_Countdown(entity this)
 		{
 			Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded);
 			Notification annce_num = Announcer_PickNumber(CNT_GAMESTART, countdown_rounded);
-			if(annce_num != NULL)		
+			if(annce_num != NULL)
 				Local_Notification(MSG_ANNCE, annce_num);
 		}
 
@@ -87,7 +87,7 @@ void Announcer_Gamestart()
 			centerprint_kill(ORDINAL(CPID_ROUND));
 			if(announcer_countdown)
 			{
-				remove(announcer_countdown);
+				delete(announcer_countdown);
 				announcer_countdown = NULL;
 			}
 		}