X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcounting.qh;h=f464cdc32c5b8dce7efa1c7de08ce2ad78deaf79;hb=f878adf879c95c0c04ae8806e45aaa285917b39d;hp=2559bf3acd9ff8e822163d961f61c3e8fbd81d3b;hpb=04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/counting.qh b/qcsrc/common/counting.qh
index 2559bf3ac..f464cdc32 100644
--- a/qcsrc/common/counting.qh
+++ b/qcsrc/common/counting.qh
@@ -1,3 +1,8 @@
+#ifndef COUNTING_H
+#define COUNTING_H
+
+#include "util.qh"
+
 // ===============================================
 //  Time processing and counting functions/macros
 // ===============================================
@@ -51,7 +56,7 @@
 		ZCTX(_("CI_THI^%d seconds")), /* third */ \
 		ZCTX(_("CI_MUL^%d seconds"))) /* multi */
 
-string count_ordinal(float interval)
+string count_ordinal(int interval)
 {
 	// 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...
@@ -60,10 +65,10 @@ string count_ordinal(float 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((mod(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(mod(interval, 10))
+		switch(interval % 10)
 		{
 			case 1: return sprintf(_("%dst"), interval);
 			case 2: return sprintf(_("%dnd"), interval);
@@ -192,8 +197,27 @@ string process_time(float outputtype, float seconds)
 					((output != "") ? sprintf(", %s", output) : ""));
 			}
 
+			return output;
+		}
+		case 3:
+		{
+			string output = "";
+
+			output = count_hours(tmp_hours);
+
+			if(tmp_weeks) { tmp_days += (tmp_weeks * 7); }
+			if(tmp_years) { tmp_days += (tmp_years * 365); }
+			if(tmp_days)
+			{
+				output = sprintf(
+					"%s%s",
+					count_days(tmp_days),
+					((output != "") ? sprintf(", %s", output) : ""));
+			}
+
 			return output;
 		}
 	}
 	return "";
 }
+#endif