Minigame code and cfg

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / counting.qh

diff --git a/qcsrc/common/counting.qh b/qcsrc/common/counting.qh
index 1413a80902d1fb338abed1881ea942c2929bf608..17c5f89bcddf9968f07ddef29f0e0fadd99abc33 100644 (file)
--- a/qcsrc/common/counting.qh
+++ b/qcsrc/common/counting.qh
@@ -1,3 +1,6 @@
+#ifndef COUNTING_H
+#define COUNTING_H
+
 // ===============================================
 //  Time processing and counting functions/macros
 // ===============================================
@@ -51,7 +54,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 +63,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);
@@ -215,3 +218,4 @@ string process_time(float outputtype, float seconds)
        }
        return "";
 }
+#endif