X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Flib%2Fcounting.qh;h=892c692d87319999e717fd5650d9e572dd4c140e;hb=7430a90e996f563c8893771f4ec0141a5a6e771e;hp=81103a51cabb8e068de2c3b03897177b132f4431;hpb=8da45596c76bb645e864b4ec8ff5a3ee13bbf27c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/lib/counting.qh b/qcsrc/lib/counting.qh
index 81103a51c..892c692d8 100644
--- a/qcsrc/lib/counting.qh
+++ b/qcsrc/lib/counting.qh
@@ -7,54 +7,60 @@
 //  Time processing and counting functions/macros
 // ===============================================
 
-#define count_years_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s years")), ftos_decimals(time, decs))
-#define count_years(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d years")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d year")),  /* first */ \
-		ZCTX(_("CI_SEC^%d years")), /* year */ \
-		ZCTX(_("CI_THI^%d years")), /* third */ \
-		ZCTX(_("CI_MUL^%d years"))) /* multi */
-
-#define count_weeks_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s weeks")), ftos_decimals(time, decs))
-#define count_weeks(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d weeks")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d week")),  /* first */ \
-		ZCTX(_("CI_SEC^%d weeks")), /* week */ \
-		ZCTX(_("CI_THI^%d weeks")), /* third */ \
-		ZCTX(_("CI_MUL^%d weeks"))) /* multi */
-
-#define count_days_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s days")), ftos_decimals(time, decs))
-#define count_days(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d days")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d day")),  /* first */ \
-		ZCTX(_("CI_SEC^%d days")), /* day */ \
-		ZCTX(_("CI_THI^%d days")), /* third */ \
-		ZCTX(_("CI_MUL^%d days"))) /* multi */
-
-#define count_hours_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s hours")), ftos_decimals(time, decs))
-#define count_hours(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d hours")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d hour")),  /* first */ \
-		ZCTX(_("CI_SEC^%d hours")), /* hour */ \
-		ZCTX(_("CI_THI^%d hours")), /* third */ \
-		ZCTX(_("CI_MUL^%d hours"))) /* multi */
-
-
-#define count_minutes_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s minutes")), ftos_decimals(time, decs))
-#define count_minutes(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d minutes")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d minute")),  /* first */ \
-		ZCTX(_("CI_SEC^%d minutes")), /* minute */ \
-		ZCTX(_("CI_THI^%d minutes")), /* third */ \
-		ZCTX(_("CI_MUL^%d minutes"))) /* multi */
-
-#define count_seconds_decs(time,decs) sprintf(ZCTX(_("CI_DEC^%s seconds")), ftos_decimals(time, decs))
-#define count_seconds(time) count_fill(time, \
-		ZCTX(_("CI_ZER^%d seconds")), /* zeroth */ \
-		ZCTX(_("CI_FIR^%d second")),  /* first */ \
-		ZCTX(_("CI_SEC^%d seconds")), /* second */ \
-		ZCTX(_("CI_THI^%d seconds")), /* third */ \
-		ZCTX(_("CI_MUL^%d seconds"))) /* multi */
+#define count_years_decs(time, decs) sprintf(CTX(_("CI_DEC^%s years")), ftos_decimals(time, decs))
+#define count_years(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d years")), /* zeroth */ \
+	CTX(_("CI_FIR^%d year")),  /* first */ \
+	CTX(_("CI_SEC^%d years")), /* year */ \
+	CTX(_("CI_THI^%d years")), /* third */ \
+	CTX(_("CI_MUL^%d years"))) /* multi */
+
+#define count_weeks_decs(time, decs) sprintf(CTX(_("CI_DEC^%s weeks")), ftos_decimals(time, decs))
+#define count_weeks(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d weeks")), /* zeroth */ \
+	CTX(_("CI_FIR^%d week")),  /* first */ \
+	CTX(_("CI_SEC^%d weeks")), /* week */ \
+	CTX(_("CI_THI^%d weeks")), /* third */ \
+	CTX(_("CI_MUL^%d weeks"))) /* multi */
+
+#define count_days_decs(time, decs) sprintf(CTX(_("CI_DEC^%s days")), ftos_decimals(time, decs))
+#define count_days(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d days")), /* zeroth */ \
+	CTX(_("CI_FIR^%d day")),  /* first */ \
+	CTX(_("CI_SEC^%d days")), /* day */ \
+	CTX(_("CI_THI^%d days")), /* third */ \
+	CTX(_("CI_MUL^%d days"))) /* multi */
+
+#define count_hours_decs(time, decs) sprintf(CTX(_("CI_DEC^%s hours")), ftos_decimals(time, decs))
+#define count_hours(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d hours")), /* zeroth */ \
+	CTX(_("CI_FIR^%d hour")),  /* first */ \
+	CTX(_("CI_SEC^%d hours")), /* hour */ \
+	CTX(_("CI_THI^%d hours")), /* third */ \
+	CTX(_("CI_MUL^%d hours"))) /* multi */
+
+
+#define count_minutes_decs(time, decs) sprintf(CTX(_("CI_DEC^%s minutes")), ftos_decimals(time, decs))
+#define count_minutes(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d minutes")), /* zeroth */ \
+	CTX(_("CI_FIR^%d minute")),  /* first */ \
+	CTX(_("CI_SEC^%d minutes")), /* minute */ \
+	CTX(_("CI_THI^%d minutes")), /* third */ \
+	CTX(_("CI_MUL^%d minutes"))) /* multi */
+
+#define count_seconds_decs(time, decs) sprintf(CTX(_("CI_DEC^%s seconds")), ftos_decimals(time, decs))
+#define count_seconds(time) \
+	count_fill(time, \
+	CTX(_("CI_ZER^%d seconds")), /* zeroth */ \
+	CTX(_("CI_FIR^%d second")),  /* first */ \
+	CTX(_("CI_SEC^%d seconds")), /* second */ \
+	CTX(_("CI_THI^%d seconds")), /* third */ \
+	CTX(_("CI_MUL^%d seconds"))) /* multi */
 
 string count_ordinal(int interval)
 {
@@ -65,10 +71,10 @@ string count_ordinal(int interval)
 	// Basically, it just allows you to represent a number or count in different ways
 	// depending on the number... like, with count_ordinal you can provide integers
 	// and retrieve 1st, 2nd, 3rd, nth ordinal numbers in a clean and simple way.
-	if(floor((interval % 100)/10) * 10 != 10) // examples: 12th, 111th, 213th will not execute this block
+	if (floor((interval % 100) / 10) * 10 != 10)  // examples: 12th, 111th, 213th will not execute this block
 	{
 		// otherwise, check normally for 1st,2nd,3rd insertions
-		switch(interval % 10)
+		switch (interval % 10)
 		{
 			case 1: return sprintf(_("%dst"), interval);
 			case 2: return sprintf(_("%dnd"), interval);
@@ -95,15 +101,14 @@ string count_fill(float interval, string zeroth, string first, string second, st
 	//   3 seconds
 	//   etc... minutes, hours, days, etc.
 
-	switch(floor(interval))
+	switch (floor(interval))
 	{
 		case 0: return sprintf(zeroth, interval);
 		case 1:
 		{
-			if(interval == 1) // EXACTLY value of 1
+			if (interval == 1)  // EXACTLY value of 1
 				return sprintf(first, interval);
-			else
-				return sprintf(multi, interval);
+			else return sprintf(multi, interval);
 		}
 		case 2: return sprintf(second, interval);
 		case 3: return sprintf(third, interval);
@@ -119,26 +124,26 @@ string process_time(float outputtype, float seconds)
 
 	tmp_seconds = floor(seconds);
 
-	if(tmp_seconds)
+	if (tmp_seconds)
 	{
 		tmp_minutes = floor(tmp_seconds / 60);
 
-		if(tmp_minutes)
+		if (tmp_minutes)
 		{
 			tmp_seconds -= (tmp_minutes * 60);
 			tmp_hours = floor(tmp_minutes / 60);
 
-			if(tmp_hours)
+			if (tmp_hours)
 			{
 				tmp_minutes -= (tmp_hours * 60);
 				tmp_days = floor(tmp_hours / 24);
 
-				if(tmp_days)
+				if (tmp_days)
 				{
 					tmp_hours -= (tmp_days * 24);
 					tmp_weeks = floor(tmp_days / 7);
 
-					if(tmp_weeks)
+					if (tmp_weeks)
 					{
 						tmp_days -= (tmp_weeks * 7);
 						tmp_years = floor(tmp_weeks / 52);
@@ -148,7 +153,7 @@ string process_time(float outputtype, float seconds)
 		}
 	}
 
-	switch(outputtype)
+	switch (outputtype)
 	{
 		case 1: return sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds);
 		case 2:
@@ -157,7 +162,7 @@ string process_time(float outputtype, float seconds)
 
 			output = count_seconds(tmp_seconds);
 
-			if(tmp_minutes)
+			if (tmp_minutes)
 			{
 				output = sprintf(
 					"%s%s",
@@ -165,7 +170,7 @@ string process_time(float outputtype, float seconds)
 					((output != "") ? sprintf(", %s", output) : ""));
 			}
 
-			if(tmp_hours)
+			if (tmp_hours)
 			{
 				output = sprintf(
 					"%s%s",
@@ -173,7 +178,7 @@ string process_time(float outputtype, float seconds)
 					((output != "") ? sprintf(", %s", output) : ""));
 			}
 
-			if(tmp_days)
+			if (tmp_days)
 			{
 				output = sprintf(
 					"%s%s",
@@ -181,7 +186,7 @@ string process_time(float outputtype, float seconds)
 					((output != "") ? sprintf(", %s", output) : ""));
 			}
 
-			if(tmp_weeks)
+			if (tmp_weeks)
 			{
 				output = sprintf(
 					"%s%s",
@@ -189,7 +194,7 @@ string process_time(float outputtype, float seconds)
 					((output != "") ? sprintf(", %s", output) : ""));
 			}
 
-			if(tmp_years)
+			if (tmp_years)
 			{
 				output = sprintf(
 					"%s%s",
@@ -205,9 +210,9 @@ string process_time(float outputtype, float seconds)
 
 			output = count_hours(tmp_hours);
 
-			if(tmp_weeks) { tmp_days += (tmp_weeks * 7); }
-			if(tmp_years) { tmp_days += (tmp_years * 365); }
-			if(tmp_days)
+			if (tmp_weeks) tmp_days += (tmp_weeks * 7);
+			if (tmp_years) tmp_days += (tmp_years * 365);
+			if (tmp_days)
 			{
 				output = sprintf(
 					"%s%s",