X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.qc;h=b8e0d5c6998c8a37cc8ec5ea9d809116d2c3e235;hp=11ebffacfa4e8762fe37d152185124005127b553;hb=797bf448a96c0c13d783c7c919bb2caf6fa16707;hpb=c8d1187c6225c1d14ce4481d59a8abca5e79eb16

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index 11ebffacf..b8e0d5c69 100644
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -819,7 +819,22 @@ void Dump_Notifications(int fh, bool alsoprint)
 	// This is not necessary, and does not matter if they vary between config versions,
 	// it is just a semi-helpful tool for those who want to manually change their user settings.
 
-	int NOTIF_ANNCE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE, { ++NOTIF_ANNCE_COUNT; });
+	int NOTIF_ANNCE_COUNT = 0;
+	int NOTIF_INFO_COUNT = 0;
+	int NOTIF_CENTER_COUNT = 0;
+	int NOTIF_MULTI_COUNT = 0;
+	int NOTIF_CHOICE_COUNT = 0;
+	FOREACH(Notifications, true, {
+		switch (it.nent_type)
+		{
+			case MSG_ANNCE: ++NOTIF_ANNCE_COUNT; break;
+			case MSG_INFO: ++NOTIF_INFO_COUNT; break;
+			case MSG_CENTER: ++NOTIF_CENTER_COUNT; break;
+			case MSG_MULTI: ++NOTIF_MULTI_COUNT; break;
+			case MSG_CHOICE: ++NOTIF_CHOICE_COUNT; break;
+		}
+	});
+
 	NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications (count = %d):\n", NOTIF_ANNCE_COUNT));
 	FOREACH(Notifications, it.nent_type == MSG_ANNCE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		NOTIF_WRITE_ENTITY(it,
@@ -827,7 +842,6 @@ void Dump_Notifications(int fh, bool alsoprint)
 		);
 	});
 
-	int NOTIF_INFO_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_INFO, { ++NOTIF_INFO_COUNT; });
 	NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT));
 	FOREACH(Notifications, it.nent_type == MSG_INFO && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		NOTIF_WRITE_ENTITY(it,
@@ -836,7 +850,6 @@ void Dump_Notifications(int fh, bool alsoprint)
 		);
 	});
 
-	int NOTIF_CENTER_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER, { ++NOTIF_CENTER_COUNT; });
 	NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT));
 	FOREACH(Notifications, it.nent_type == MSG_CENTER && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		NOTIF_WRITE_ENTITY(it,
@@ -844,7 +857,6 @@ void Dump_Notifications(int fh, bool alsoprint)
 		);
 	});
 
-	int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; });
 	NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications (count = %d):\n", NOTIF_MULTI_COUNT));
 	FOREACH(Notifications, it.nent_type == MSG_MULTI && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		NOTIF_WRITE_ENTITY(it,
@@ -852,7 +864,6 @@ void Dump_Notifications(int fh, bool alsoprint)
 		);
 	});
 
-	int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; });
 	NOTIF_WRITE(sprintf("\n// MSG_CHOICE notifications (count = %d):\n", NOTIF_CHOICE_COUNT));
 	FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
 		NOTIF_WRITE_ENTITY_CHOICE(it,