# HG changeset patch
# User yexo <yexo@openttd.org>
# Date 2012-01-21 13:57:24
# Node ID 4483d36fee968cc441e5bb02185d903afbd75bf7
# Parent  7f8fcf75bfbe7b2d3c14bbb252e4d60642b0cfc7

(svn r23830) -Revert (r23804) [FS#4986]: while the idea was good, it causes too much trouble

diff --git a/src/newgrf_text.cpp b/src/newgrf_text.cpp
--- a/src/newgrf_text.cpp
+++ b/src/newgrf_text.cpp
@@ -1066,7 +1066,7 @@ uint RemapNewGRFStringControlCode(uint s
 			case SCC_NEWGRF_UNPRINT:                *buff = max(*buff - Utf8Consume(str), buf_start); break;
 
 			case SCC_NEWGRF_PRINT_WORD_STRING_ID:
-				*argv = _newgrf_textrefstack.PopUnsignedWord();
+				*argv = TTDPStringIDToOTTDStringIDMapping(_newgrf_textrefstack.PopUnsignedWord());
 				break;
 		}
 	}
diff --git a/src/strings.cpp b/src/strings.cpp
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -838,7 +838,7 @@ static char *FormatString(char *buff, co
 			}
 
 			case SCC_NEWGRF_PRINT_WORD_STRING_ID: {
-				StringID substr = TTDPStringIDToOTTDStringIDMapping(args->GetInt32(SCC_NEWGRF_PRINT_WORD_STRING_ID));
+				StringID substr = args->GetInt32(SCC_NEWGRF_PRINT_WORD_STRING_ID);
 				str_stack.push(GetStringPtr(substr));
 				case_index = next_substr_case_index;
 				next_substr_case_index = 0;