X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.qc;h=e2c1e185afbea1b4e16e5f0d1599327bd95023bd;hb=67610c5b92e218cc245c040209c1a79ab6b02758;hp=b8e0d5c6998c8a37cc8ec5ea9d809116d2c3e235;hpb=0b81c8ddcc0fd34433e710dbfe2b55afe0d6d7eb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index b8e0d5c699..e2c1e185af 100644
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -7,8 +7,8 @@
 	#include <common/net_linked.qh>
 	#include <common/teams.qh>
 	#include <server/autocvars.qh>
-	#include <server/constants.qh>
-	#include <server/defs.qh>
+	#include <server/command/getreplies.qh>
+	#include <server/world.qh>
 	#include <server/mutators/_mod.qh>
 #endif
 
@@ -159,7 +159,7 @@ void Destroy_All_Notifications()
 	#ifdef SVQC
 	Kill_Notification(NOTIF_ALL, NULL, MSG_Null, CPID_Null);
 	#else
-	reset_centerprint_messages();
+	centerprint_KillAll();
 	#endif
 
 	// kill all real notification entities
@@ -761,7 +761,7 @@ void Create_Notification_Entity_Choice(entity notif,
 #ifdef SVQC
 void Notification_GetCvars(entity this)
 {
-	FOREACH(Notifications, it.nent_type == MSG_CHOICE, {
+	FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		GetCvars_handleFloat(
 			this,
 			CS(this),
@@ -1130,7 +1130,7 @@ void Local_Notification_HUD_Notify_Push(
 	HUD_Notify_Push(icon, arg_slot[0], arg_slot[1]);
 }
 
-void Local_Notification_centerprint_generic(
+void Local_Notification_centerprint_Add(
 	string input, string durcnt,
 	CPID cpid, float f1, float f2)
 {
@@ -1139,7 +1139,7 @@ void Local_Notification_centerprint_generic(
 	for (int sel_num = 0; (durcnt != ""); )
 	{
 		string selected = car(durcnt); durcnt = cdr(durcnt);
-		NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic");
+		NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_Add");
 		switch (strtolower(selected))
 		{
 			#define ARG_CASE_ARG_CS_SV_HA(selected, result)
@@ -1160,14 +1160,14 @@ void Local_Notification_centerprint_generic(
 			default:
 			{
 				if (/* wtf */ ftos(stof(selected)) != "") { arg_slot[sel_num++] = selected; }
-				else { NOTIF_HIT_UNKNOWN(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic") }
+				else { NOTIF_HIT_UNKNOWN(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_Add") }
 				break;
 			}
 		}
 	}
 	#ifdef NOTIFICATIONS_DEBUG
 	Debug_Notification(sprintf(
-		"Local_Notification_centerprint_generic('%s^7', '%s', %d, %d, %d, %d);\n",
+		"Local_Notification_centerprint_Add('%s^7', '%s', %d, %d, %d, %d);\n",
 		MakeConsoleSafe(input),
 		durcnt,
 		f1, f2,
@@ -1175,7 +1175,7 @@ void Local_Notification_centerprint_generic(
 		stof(arg_slot[1])
 	));
 	#endif
-	centerprint_generic(ORDINAL(cpid), input, stof(arg_slot[0]), stof(arg_slot[1]));
+	centerprint_Add(ORDINAL(cpid), input, stof(arg_slot[0]), stof(arg_slot[1]));
 }
 #endif
 
@@ -1289,7 +1289,7 @@ void Local_Notification(MSG net_type, Notification net_name, ...count)
 		#ifdef CSQC
 		case MSG_CENTER:
 		{
-			Local_Notification_centerprint_generic(
+			Local_Notification_centerprint_Add(
 				Local_Notification_sprintf(
 					notif.nent_string,
 					notif.nent_args,
@@ -1408,11 +1408,9 @@ NET_HANDLE(ENT_CLIENT_NOTIFICATION, bool is_new)
         int _net_name = net_name;
         CPID net_name = ENUMCAST(CPID, _net_name);
         if (net_name == CPID_Null) {
-            // kill all
-            reset_centerprint_messages();
+            centerprint_KillAll();
         } else {
-            // kill group
-            centerprint_generic(ORDINAL(net_name), "", 0, 0);
+            centerprint_Kill(ORDINAL(net_name));// kill group
         }
         return;
     }