- removed the implicit conversion operators from FName.
These were creating dangerous interdependencies. It is better to do explicit conversions when needed. As an added plus, this means that zstring.h no longer depends on name.h which was very annoying.
This commit is contained in:
parent
6996d54a23
commit
ace3e29473
57 changed files with 184 additions and 200 deletions
|
|
@ -820,7 +820,7 @@ void D_ReadUserInfoStrings (int pnum, uint8_t **stream, bool update)
|
|||
}
|
||||
|
||||
// A few of these need special handling.
|
||||
switch (keyname)
|
||||
switch (keyname.GetIndex())
|
||||
{
|
||||
case NAME_Gender:
|
||||
info->GenderChanged(value);
|
||||
|
|
@ -904,7 +904,7 @@ void WriteUserInfo(FSerializer &arc, userinfo_t &info)
|
|||
|
||||
while (it.NextPair(pair))
|
||||
{
|
||||
name = pair->Key;
|
||||
name = pair->Key.GetChars();
|
||||
name.ToLower();
|
||||
switch (pair->Key.GetIndex())
|
||||
{
|
||||
|
|
@ -945,7 +945,7 @@ void ReadUserInfo(FSerializer &arc, userinfo_t &info, FString &skin)
|
|||
FBaseCVar **cvar = info.CheckKey(name);
|
||||
if (cvar != NULL && *cvar != NULL)
|
||||
{
|
||||
switch (name)
|
||||
switch (name.GetIndex())
|
||||
{
|
||||
case NAME_Team: info.TeamChanged(atoi(str)); break;
|
||||
case NAME_Skin: skin = str; break; // Caller must call SkinChanged() once current calss is known
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue