mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6158) -Revert r6139 as that breaks strings with cases. Thanks michi_cc

release/0.5
Darkvater 2006-08-26 20:54:30 +00:00
parent 96e9fd333b
commit 6540ae18fd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
strings.c
View File

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

2
strings.h
View File

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