diff options
author | Darkvater <darkvater@openttd.org> | 2006-08-26 20:54:30 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-08-26 20:54:30 +0000 |
commit | 6540ae18fd4447ecd4f5dd04b35c3e8248da3124 (patch) | |
tree | 66fe02d43990796cae75b40588f5d49cbc65d424 | |
parent | 96e9fd333bd912c660b129afd6105dd6b1f664fd (diff) | |
download | openttd-6540ae18fd4447ecd4f5dd04b35c3e8248da3124.tar.xz |
(svn r6158) -Revert r6139 as that breaks strings with cases. Thanks michi_cc
-rw-r--r-- | strings.c | 4 | ||||
-rw-r--r-- | strings.h | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -167,8 +167,8 @@ static const char *GetStringPtr(StringID string) // The highest 8 bits of string contain the "case index". // These 8 bits will only be set when FormatString wants to print // the string in a different case. No one else except FormatString -// should set those bits. -char *GetStringWithArgs(char *buffr, StringID string, const int32 *argv) +// should set those bits, therefore string CANNOT be StringID, but uint32. +char *GetStringWithArgs(char *buffr, uint string, const int32 *argv) { uint index = GB(string, 0, 11); 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 *GetStringWithArgs(char *buffr, uint16 string, const int32 *argv); +char *GetStringWithArgs(char *buffr, uint string, const int32 *argv); extern char _userstring[128]; |