zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add FBaseCVar::GetHumanString()

Browse source 
- For most cvars, this is equivalent to calling GetGenericRep() to get a
  string.
- For float cvars, it uses %g instead of %H, because %H is generally more
  information than is needed.
This commit is contained in:
Randy Heit 2016-04-23 22:30:08 -05:00
parent fc54dd1ff0
commit e96ed6bf8d
5 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/c_cvars.cpp
View file

@ -132,6 +132,11 @@ FBaseCVar::~FBaseCVar ()
}
}
const char *FBaseCVar::GetHumanString(int precision) const
{
return GetGenericRep(CVAR_String).String;
}
void FBaseCVar::ForceSet (UCVarValue value, ECVarType type, bool nouserinfosend)
{
DoSet (value, type);
@ -750,6 +755,16 @@ ECVarType FFloatCVar::GetRealType () const
return CVAR_Float;
}
const char *FFloatCVar::GetHumanString(int precision) const
{
if (precision < 0)
{
precision = 6;
}
mysnprintf(cstrbuf, countof(cstrbuf), "%.*g", precision, Value);
return cstrbuf;
}
UCVarValue FFloatCVar::GetGenericRep (ECVarType type) const
{
return FromFloat (Value, type);
@ -1675,7 +1690,7 @@ void FBaseCVar::ListVars (const char *filter, bool plain)
if (!(flags & CVAR_UNSETTABLE))
{
++count;
Printf ("%s : %s\n", var->GetName(), var->GetGenericRep(CVAR_String).String);
Printf ("%s : %s\n", var->GetName(), var->GetHumanString());
}
}
else
@ -1692,7 +1707,7 @@ void FBaseCVar::ListVars (const char *filter, bool plain)
flags & CVAR_MOD ? 'M' : ' ',
flags & CVAR_IGNORE ? 'X' : ' ',
var->GetName(),
var->GetGenericRep(CVAR_String).String);
var->GetHumanString());
}
}
var = var->m_Next;

2
src/c_cvars.h
View file

@ -108,6 +108,7 @@ public:
virtual ECVarType GetRealType () const = 0;
virtual const char *GetHumanString(int precision=-1) const;
virtual UCVarValue GetGenericRep (ECVarType type) const = 0;
virtual UCVarValue GetFavoriteRep (ECVarType *type) const = 0;
@ -268,6 +269,7 @@ public:
virtual UCVarValue GetGenericRepDefault (ECVarType type) const;
virtual UCVarValue GetFavoriteRepDefault (ECVarType *type) const;
virtual void SetGenericRepDefault (UCVarValue value, ECVarType type);
const char *GetHumanString(int precision) const override;
float operator= (float floatval)
{ UCVarValue val; val.Float = floatval; SetGenericRep (val, CVAR_Float); return floatval; }

3
src/c_dispatch.cpp
View file

@ -651,8 +651,7 @@ void C_DoCommand (const char *cmd, int keynum)
}
else
{ // Get the variable's value
UCVarValue val = var->GetGenericRep (CVAR_String);
Printf ("\"%s\" is \"%s\"\n", var->GetName(), val.String);
Printf ("\"%s\" is \"%s\"\n", var->GetName(), var->GetHumanString());
}
}
else

3
src/d_netinfo.cpp
View file

@ -993,8 +993,7 @@ CCMD (playerinfo)
if (pair->Key != NAME_Name && pair->Key != NAME_Team && pair->Key != NAME_Skin &&
pair->Key != NAME_Gender && pair->Key != NAME_PlayerClass)
{
UCVarValue val = pair->Value->GetGenericRep(CVAR_String);
Printf("%20s: %s\n", pair->Key.GetChars(), val.String);
Printf("%20s: %s\n", pair->Key.GetChars(), pair->Value->GetHumanString());
}
}
if (argv.argc() > 2)

6
src/menu/optionmenuitems.h
View file

@ -295,10 +295,10 @@ public:
}
else
{
UCVarValue cv = mCVar->GetGenericRep(CVAR_String);
const char *cv = mCVar->GetHumanString();
for(unsigned i = 0; i < (*opt)->mValues.Size(); i++)
{
if ((*opt)->mValues[i].TextValue.CompareNoCase(cv.String) == 0)
if ((*opt)->mValues[i].TextValue.CompareNoCase(cv) == 0)
{
Selection = i;
break;
@ -995,7 +995,7 @@ public:
if ( mCVar == NULL )
return "";
return mCVar->GetGenericRep( CVAR_String ).String;
return mCVar->GetHumanString();
}
virtual FString Represent()