Merge branch 'maint'

This commit is contained in:
Braden Obrzut 2014-01-18 18:10:48 -05:00
commit efa9e0c3ee
10 changed files with 1231 additions and 1203 deletions

View file

@ -861,7 +861,7 @@ void D_ReadUserInfoStrings (int pnum, BYTE **stream, bool update)
val.String = CleanseString(value.LockBuffer());
(*cvar_ptr)->SetGenericRep(val, CVAR_String);
value.UnlockBuffer();
if (keyname == NAME_Name && update && oldname != value)
if (keyname == NAME_Name && update && oldname.Compare (value))
{
Printf("%s is now known as %s\n", oldname.GetChars(), value.GetChars());
}