mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-17 21:25:40 +00:00
(svn r6158) -Revert r6139 as that breaks strings with cases. Thanks michi_cc
This commit is contained in:
parent
7f84bcc917
commit
ea0fbc1118
@ -167,8 +167,8 @@ static const char *GetStringPtr(StringID string)
|
|||||||
// The highest 8 bits of string contain the "case index".
|
// The highest 8 bits of string contain the "case index".
|
||||||
// These 8 bits will only be set when FormatString wants to print
|
// These 8 bits will only be set when FormatString wants to print
|
||||||
// the string in a different case. No one else except FormatString
|
// the string in a different case. No one else except FormatString
|
||||||
// should set those bits.
|
// should set those bits, therefore string CANNOT be StringID, but uint32.
|
||||||
char *GetStringWithArgs(char *buffr, StringID string, const int32 *argv)
|
char *GetStringWithArgs(char *buffr, uint string, const int32 *argv)
|
||||||
{
|
{
|
||||||
uint index = GB(string, 0, 11);
|
uint index = GB(string, 0, 11);
|
||||||
uint tab = GB(string, 11, 5);
|
uint tab = GB(string, 11, 5);
|
||||||
|
@ -12,7 +12,7 @@ static inline char* InlineString(char* buf, uint16 string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
char *GetString(char *buffr, uint16 string);
|
char *GetString(char *buffr, uint16 string);
|
||||||
char *GetStringWithArgs(char *buffr, uint16 string, const int32 *argv);
|
char *GetStringWithArgs(char *buffr, uint string, const int32 *argv);
|
||||||
|
|
||||||
extern char _userstring[128];
|
extern char _userstring[128];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user