Sophie

Sophie

distrib > Mageia > 7 > x86_64 > by-pkgid > c454f376972cbfd7d68cec1511ac621f > files > 7

assaultcube-1.2.0.2-7.mga7.nonfree.src.rpm

diff --git a/source/src/rendertext.cpp b/assaultcube/source/src/rendertext.cpp
index 0ed23af..8cd63c3 100644
--- a/source/src/rendertext.cpp
+++ b/source/src/rendertext.cpp
@@ -330,7 +330,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
         if(c=='r') c = stack[(sp > 0) ? --sp : sp]; // restore color
         else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed
         else stack[sp] = c;
-        switch(abs(stack[sp]))
+        switch((int) abs(stack[sp]))
         {
             case '0': color = bvec( 2,  255,  128 ); break;   // green: player talk
             case '1': color = bvec( 96,  160, 255 ); break;   // blue: team chat
diff --git a/source/src/tools.h b/assaultcube/source/src/tools.h
index 0aeacff..8a20f05 100644
--- a/source/src/tools.h
+++ b/source/src/tools.h
@@ -55,8 +55,6 @@ static inline T min(T a, T b)
     return a < b ? a : b;
 }
 
-static inline float round(float x) { return floor(x + 0.5f); }
-
 #define clamp(a,b,c) (max(b, min(a, c)))
 #define rnd(x) ((int)(randomMT()&0xFFFFFF)%(x))
 #define rndscale(x) (float((randomMT()&0xFFFFFF)*double(x)/double(0xFFFFFF)))