diff options
| author | rubidium <rubidium@openttd.org> | 2011-10-01 20:31:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-10-01 20:31:21 +0000 |
| commit | 7de22e25da5b5c12599d9bad2e12aa9abb3bd7bf (patch) | |
| tree | 1141d987d537b6d916e299371dd9403793c0e9f7 /src/newgrf_text.h | |
| parent | 5c01ce91e6e981225a0e23021ccc69cc0c5fe3fa (diff) | |
| download | openttd-7de22e25da5b5c12599d9bad2e12aa9abb3bd7bf.tar.xz | |
(svn r22970) -Fix [FS#4769]: strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name
Diffstat (limited to 'src/newgrf_text.h')
| -rw-r--r-- | src/newgrf_text.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_text.h b/src/newgrf_text.h index 3531f5b94..4a9d96af1 100644 --- a/src/newgrf_text.h +++ b/src/newgrf_text.h @@ -19,16 +19,16 @@ /** 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 AddGRFString(uint32 grfid, uint16 stringid, byte langid, bool new_scheme, bool allow_newlines, const char *text_to_add, StringID def_string); StringID GetGRFStringID(uint32 grfid, uint16 stringid); const char *GetGRFStringFromGRFText(const struct GRFText *text); const char *GetGRFStringPtr(uint16 stringid); void CleanUpStrings(); void SetCurrentGrfLangID(byte language_id); -char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, const char *str, int *olen = NULL); +char *TranslateTTDPatchCodes(uint32 grfid, uint8 language_id, bool allow_newlines, const char *str, int *olen = NULL); struct GRFText *DuplicateGRFText(struct GRFText *orig); void AddGRFTextToList(struct GRFText **list, struct GRFText *text_to_add); -void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, const char *text_to_add); +void AddGRFTextToList(struct GRFText **list, byte langid, uint32 grfid, bool allow_newlines, const char *text_to_add); void AddGRFTextToList(struct GRFText **list, const char *text_to_add); void CleanUpGRFText(struct GRFText *grftext); |