cpp/openttd-patchpack/source Changeset - r21947:4b2aaf36e24d

Changeset - r21947:4b2aaf36e24d

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 9 years ago 2015-01-01 20:50:43
rubidium@openttd.org

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

4 files changed with 4 insertions and 3 deletions:

src/script/api/script_text.cpp

src/script/api/script_text.hpp

src/stdafx.h

src/strings.cpp

0 comments (0 inline, 0 general)

src/script/api/script_text.cpp

➞

Show inline comments

@@ @@ -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++;
+	}

src/script/api/script_text.hpp

➞

Show inline comments

@@ @@ -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;

src/stdafx.h

➞

Show inline comments

@@ @@ -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"

src/strings.cpp

➞

Show inline comments

@@ @@ -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) {

0 comments (0 inline, 0 general)