From b9e3f57894bd5cb4cf7057103b320c75d94d8150 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Sun, 10 Nov 2013 04:26:57 +0000
Subject: [PATCH] - attempt to rollback change that causes game differences on
 different platforms

---
 source/shared_lib/include/graphics/vec.h      | 20 ++++++-------
 source/shared_lib/include/util/conversion.h   |  4 +--
 source/shared_lib/sources/util/conversion.cpp | 28 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/source/shared_lib/include/graphics/vec.h b/source/shared_lib/include/graphics/vec.h
index 1a02f7d62..73cad1ae8 100644
--- a/source/shared_lib/include/graphics/vec.h
+++ b/source/shared_lib/include/graphics/vec.h
@@ -63,16 +63,16 @@ inline T truncateDecimal(const T &value, int precision=6) {
 
 	// See if we can avoid using an int64 for speed
 // To avoid stupid VC++ compiler error: illegal token on right side of '::'
-#ifdef WIN32 
-#undef max
-#endif
-	static int MAX_INT_VALUE = numeric_limits<int>::max();
-	if((T)value * (T)precNum <= MAX_INT_VALUE) {
-		int resultInt = (int)((T)value * (T)precNum);
-		T result = (T)resultInt / precNum;
-		//printf("=======================\nvalue = %.10f\nresultInt: %d\nprecision: %d\nbecame: %.10f\n----------\n",value,resultInt,precision,result);
-		return result;
-	}
+//#ifdef WIN32
+//#undef max
+//#endif
+//	static int MAX_INT_VALUE = numeric_limits<int>::max();
+//	if((T)value * (T)precNum <= MAX_INT_VALUE) {
+//		int resultInt = (int)((T)value * (T)precNum);
+//		T result = (T)resultInt / precNum;
+//		//printf("=======================\nvalue = %.10f\nresultInt: %d\nprecision: %d\nbecame: %.10f\n----------\n",value,resultInt,precision,result);
+//		return result;
+//	}
 
 	// Must use an int64 since the result is large
 	int64 resultInt = (int64)((T)value * (T)precNum);
diff --git a/source/shared_lib/include/util/conversion.h b/source/shared_lib/include/util/conversion.h
index e2b420a51..3b29f5015 100644
--- a/source/shared_lib/include/util/conversion.h
+++ b/source/shared_lib/include/util/conversion.h
@@ -33,8 +33,8 @@ bool strToUInt(const string &s, uint32 *i);
 bool strToFloat(const string &s, float *f);
 
 string boolToStr(bool b);
-string uIntToStr(const uint64 &value);
-string intToStr(const int64 &value);
+string uIntToStr(const uint64 value);
+string intToStr(const int64 value);
 string intToHex(int i);
 string floatToStr(float f,int precsion=2);
 string doubleToStr(double f,int precsion=2);
diff --git a/source/shared_lib/sources/util/conversion.cpp b/source/shared_lib/sources/util/conversion.cpp
index fb4ca9298..49cc0b36f 100644
--- a/source/shared_lib/sources/util/conversion.cpp
+++ b/source/shared_lib/sources/util/conversion.cpp
@@ -133,27 +133,27 @@ string boolToStr(bool b) {
 	}
 }
 
-string intToStr(const int64 &value) {
+string intToStr(const int64 value) {
 	char str[strSize]="";
-	static int MAX_INT_VALUE = std::numeric_limits<int>::max();
-	if(value <= MAX_INT_VALUE) {
-		snprintf(str, strSize-1, "%d", (int)value);
-	}
-	else {
+//	static int MAX_INT_VALUE = std::numeric_limits<int>::max();
+//	if(value <= MAX_INT_VALUE) {
+//		snprintf(str, strSize-1, "%d", (int)value);
+//	}
+//	else {
 		snprintf(str, strSize-1, "%lld", (long long int)value);
-	}
+//	}
 	return (str[0] != '\0' ? str : "");
 }
 
-string uIntToStr(const uint64 &value) {
+string uIntToStr(const uint64 value) {
 	char str[strSize]="";
-	static unsigned int MAX_UNSIGNED_INT_VALUE = std::numeric_limits<unsigned int>::max();
-	if(value <= MAX_UNSIGNED_INT_VALUE) {
-		snprintf(str, strSize-1, "%u", (int)value);
-	}
-	else {
+//	static unsigned int MAX_UNSIGNED_INT_VALUE = std::numeric_limits<unsigned int>::max();
+//	if(value <= MAX_UNSIGNED_INT_VALUE) {
+//		snprintf(str, strSize-1, "%u", (int)value);
+//	}
+//	else {
 		snprintf(str, strSize-1, "%llu", (long long unsigned int)value);
-	}
+//	}
 	return (str[0] != '\0' ? str : "");
 }