# HG changeset patch # User Darkvater # Date 1156625670 0 # Node ID 262b9ef8ab8f67778a62ff7735ef882ffbb9d30d # Parent 484c76b14294e9c74b4e1d8fb7800bd5d4c5528c (svn r6158) -Revert r6139 as that breaks strings with cases. Thanks michi_cc diff -r 484c76b14294 -r 262b9ef8ab8f strings.c --- a/strings.c Sat Aug 26 20:09:25 2006 +0000 +++ b/strings.c Sat Aug 26 20:54:30 2006 +0000 @@ -167,8 +167,8 @@ // 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); diff -r 484c76b14294 -r 262b9ef8ab8f strings.h --- a/strings.h Sat Aug 26 20:09:25 2006 +0000 +++ b/strings.h Sat Aug 26 20:54:30 2006 +0000 @@ -12,7 +12,7 @@ } 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];