Mercurial > hg > openttd

changeset 16483:4a73d307d9f2 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21207) -Codechange: replace the magic 0x00DE constant with something less magic
author rubidium <rubidium@openttd.org>
date Tue, 16 Nov 2010 12:35:16 +0000
parents 91f657d6370b
children 92174638bc84
files src/newgrf_text.cpp src/newgrf_text.h
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -21,6 +21,7 @@
 #include "newgrf.h"
 #include "strings_func.h"
 #include "newgrf_storage.h"
+#include "newgrf_text.h"
 #include "string_func.h"
 #include "date_type.h"
 #include "debug.h"
@@ -232,8 +233,7 @@
 	WChar c;
 	size_t len = Utf8Decode(&c, str);
 
-	if (c == 0x00DE) {
-		/* The thorn ('þ') indicates a unicode string to TTDPatch */
+	if (c == NFO_UTF8_IDENTIFIER) {
 		unicode = true;
 		str += len;
 	}
--- a/src/newgrf_text.h
+++ b/src/newgrf_text.h
@@ -12,8 +12,12 @@
 #ifndef NEWGRF_TEXT_H
 #define NEWGRF_TEXT_H
 
+#include "string_type.h"
 #include "strings_type.h"
 
+/** This character, the thorn ('þ'), indicates a unicode string to NFO. */
+static const WChar NFO_UTF8_IDENTIFIER = 0x00DE;
+
 StringID AddGRFString(uint32 grfid, uint16 stringid, byte langid, bool new_scheme, const char *text_to_add, StringID def_string);
 StringID GetGRFStringID(uint32 grfid, uint16 stringid);
 const char *GetGRFStringFromGRFText(const struct GRFText *text);