# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2015-01-01 20:50:43
# Node ID 4b2aaf36e24d1b7247871686dc74d0d19b103966
# Parent  15cf8b3cd86b22729706378a8dcf88d40f4e9e36

(svn r27102) -Fix [FS#6194]: money values would end up wrong in strings when outside of the bounds of a 32 bits integer

diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -201,7 +201,7 @@ char *ScriptText::_GetEncodedText(char *
 			p = this->paramt[i]->_GetEncodedText(p, lastofp, param_count);
 			continue;
 		}
-		p += seprintf(p, lastofp,":%X", (uint32)this->parami[i]);
+		p += seprintf(p, lastofp,":" OTTD_PRINTFHEX64, this->parami[i]);
 		param_count++;
 	}
 
diff --git a/src/script/api/script_text.hpp b/src/script/api/script_text.hpp
--- a/src/script/api/script_text.hpp
+++ b/src/script/api/script_text.hpp
@@ -129,7 +129,7 @@ public:
 private:
 	StringID string;
 	char *params[SCRIPT_TEXT_MAX_PARAMETERS];
-	int parami[SCRIPT_TEXT_MAX_PARAMETERS];
+	int64 parami[SCRIPT_TEXT_MAX_PARAMETERS];
 	ScriptText *paramt[SCRIPT_TEXT_MAX_PARAMETERS];
 	int paramc;
 
diff --git a/src/stdafx.h b/src/stdafx.h
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -322,6 +322,7 @@
 	#define OTTD_PRINTF64 "%I64d"
 	#define OTTD_PRINTFHEX64 "%I64x"
 	#define PRINTF_SIZE "%Iu"
+	#define strtoull _strtoui64
 #else
 	#define OTTD_PRINTF64 "%lld"
 	#define OTTD_PRINTFHEX64 "%llx"
diff --git a/src/strings.cpp b/src/strings.cpp
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -874,7 +874,7 @@ static char *FormatString(char *buff, co
 						bool lookup = (l == SCC_ENCODED);
 						if (lookup) s += len;
 
-						param = (int32)strtoul(s, &p, 16);
+						param = strtoull(s, &p, 16);
 
 						if (lookup) {
 							if (param >= TAB_SIZE) {