X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Futil.qc;h=7fa2f576a64649cce85982cf908b5b4b0ae2a229;hb=30e9db455abe691a3560555a989beb382b3b2531;hp=c3346663328abe19a33d2fe3f9e45a5482a56604;hpb=90402faa533fdf24aa21c02692eb053baaeb2285;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index c33466633..7fa2f576a 100644
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -2504,32 +2504,6 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 		queue_start.FindConnectedComponent_processing = 0;
 }
 
-float Count_Proper_Strings(string improper, string...count)
-{
-	float i, total = 0;
-	string tmp;
-	
-	for(i = 0; i < count; ++i)
-	{
-		tmp = ...(i, string);
-		if((tmp) && (tmp != improper)) { ++total; }
-	}
-	
-	return total;
-}
-
-float Count_Proper_Floats(float improper, float...count)
-{
-	float i, total = 0;
-	
-	for(i = 0; i < count; ++i)
-	{
-		if(...(i, float) != improper) { ++total; }
-	}
-	
-	return total;
-}
-
 // todo: this sucks, lets find a better way to do backtraces?
 #ifndef MENUQC
 void backtrace(string msg)
@@ -2606,68 +2580,29 @@ vector animfixfps(entity e, vector a, vector b)
 }
 #endif
 
-string count_append(float interval, string zeroth, string first, string second, string third, string multi)
+#ifdef SVQC
+void dedicated_print(string input) // print(), but only print if the server is not local
 {
-	// This function is designed primarily for the English language, it's impossible
-	// to accomodate all languages unless we do a specific function for each one...
-	// and since that's not technically feasible/practical, this is all we've got folks.
-
-	string timestring = sprintf("%d", interval);
-	float lastnum = stof(substring(timestring, (strlen(timestring) - 1), 1));
-	
-	switch(lastnum)
-	{
-		case 0: return sprintf(zeroth, interval);
-		case 1:
-		{
-			if(interval == 1) // EXACTLY value of 1
-				return sprintf(first, interval);
-			else
-				return sprintf(multi, interval);
-		}
-		case 2: return sprintf(second, interval);
-		case 3: return sprintf(third, interval);
-		default: return sprintf(multi, interval);
-	}
-	return "";
+	if(server_is_dedicated) { print(input); }
 }
+#endif
 
-string process_time(float seconds, float output)
+#ifndef MENUQC
+float Announcer_PickNumber(float num)
 {
-	float tmp_hours = 0, tmp_minutes = 0, tmp_seconds = 0;
-	float tmp_years = 0, tmp_weeks = 0, tmp_days = 0;
-	
-	tmp_seconds = floor(seconds);
-
-	if(tmp_seconds)
-		{ tmp_minutes = floor(tmp_seconds / 60); }
-	
-	if(tmp_minutes)
-		{ tmp_seconds -= (tmp_minutes * 60);
-		tmp_hours = floor(tmp_minutes / 60); }
-
-	if(tmp_hours)
-		{ tmp_minutes -= (tmp_hours * 60); }
-
-	if(output > 1)
+	switch(num)
 	{
-		if(tmp_hours)
-			{ tmp_days = floor(tmp_hours / 24); }
-			
-		if(tmp_days)
-			{ tmp_hours -= (tmp_days * 60);
-			tmp_weeks = floor(tmp_days / 7); }
-
-		if(tmp_weeks)
-			{ tmp_days -= (tmp_weeks * 60);
-			tmp_years = floor(tmp_weeks / 52); }
+		case 10: num = ANNCE_NUM_10; break;
+		case 9:  num = ANNCE_NUM_9;  break;
+		case 8:  num = ANNCE_NUM_8;  break;
+		case 7:  num = ANNCE_NUM_7;  break;
+		case 6:  num = ANNCE_NUM_6;  break;
+		case 5:  num = ANNCE_NUM_5;  break;
+		case 4:  num = ANNCE_NUM_4;  break;
+		case 3:  num = ANNCE_NUM_3;  break;
+		case 2:  num = ANNCE_NUM_2;  break;
+		case 1:  num = ANNCE_NUM_1;  break;
 	}
-
-	switch(output)
-	{
-		case 1: return sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds);
-		//todo
-		default: return "";
-	}
-	return "";
+	return num;
 }
+#endif