(svn r6158) -Revert r6139 as that breaks strings with cases. Thanks michi_cc
This commit is contained in:
		@@ -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];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user