X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications.qc;h=a406df52419dc71d1bdf985e7aa963e83b988fa1;hb=867ce0406b74601b6d74a4ac412ac30063490d88;hp=b48daec7bcec244b831d8a74129eee9bfae826a8;hpb=812b9d44a27f71f13c801e2efc1aae1aea223b95;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index b48daec7b..a406df524 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -946,8 +946,7 @@ void Create_Notification_Entity(
 #ifdef SVQC
 void Notification_GetCvars(void)
 {
-	float i;
-	for(i = 0; i <= NOTIF_CHOICE_COUNT; ++i)
+	for(int i = 0; i <= NOTIF_CHOICE_COUNT; ++i)
 	{
 		GetCvars_handleFloat(
 			get_cvars_s,
@@ -1633,7 +1632,7 @@ void Local_Notification(int net_type, int net_name, ...count)
 
 			if(notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2)))
 			{
-				switch(cvar_string(sprintf("notification_%s", notif.nent_name)))
+				switch(cvar(sprintf("notification_%s", notif.nent_name)))
 				{
 					case 1: found_choice = notif.nent_optiona; break;
 					case 2: found_choice = notif.nent_optionb; break;
@@ -1763,21 +1762,19 @@ void Net_Notification_Remove()
 	));
 	#endif
 
-	float i;
-	for(i = 0; i < 4; ++i) { if(self.nent_strings[i]) { strunzone(self.nent_strings[i]); } }
+	for(int i = 0; i < 4; ++i) { if(self.nent_strings[i]) { strunzone(self.nent_strings[i]); } }
 	remove(self);
 }
 
-float Net_Write_Notification(entity client, float sf)
+float Net_Write_Notification(entity client, int sf)
 {
 	if(Notification_ShouldSend(self.nent_broadcast, client, self.nent_client))
 	{
-		float i;
 		WriteByte(MSG_ENTITY, ENT_CLIENT_NOTIFICATION);
 		WriteByte(MSG_ENTITY, self.nent_net_type);
 		WriteShort(MSG_ENTITY, self.nent_net_name);
-		for(i = 0; i < self.nent_stringcount; ++i) { WriteString(MSG_ENTITY, self.nent_strings[i]); }
-		for(i = 0; i < self.nent_floatcount; ++i) { WriteLong(MSG_ENTITY, self.nent_floats[i]); }
+		for(int i = 0; i < self.nent_stringcount; ++i) { WriteString(MSG_ENTITY, self.nent_strings[i]); }
+		for(int i = 0; i < self.nent_floatcount; ++i) { WriteLong(MSG_ENTITY, self.nent_floats[i]); }
 		return true;
 	}
 	else { return false; }
@@ -2098,10 +2095,9 @@ void Send_Notification(
 		net_notif.nent_stringcount = notif.nent_stringcount;
 		net_notif.nent_floatcount = notif.nent_floatcount;
 
-		float i;
-		for(i = 0; i < net_notif.nent_stringcount; ++i)
+		for(int i = 0; i < net_notif.nent_stringcount; ++i)
 			{ net_notif.nent_strings[i] = strzone(...(i, string)); }
-		for(i = 0; i < net_notif.nent_floatcount; ++i)
+		for(int i = 0; i < net_notif.nent_floatcount; ++i)
 			{ net_notif.nent_floats[i] = ...((net_notif.nent_stringcount + i), float); }
 
 		net_notif.think = Net_Notification_Remove;