AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'c46f861'

Browse Source
This commit is contained in:
Phillip Stephens
2018-01-13 23:38:17 -08:00
parent 7a815e2962 52c14848d9
commit 4543e2a87e
7 changed files with 132 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
hecl/lib/CVar.cpp
View File

@@ -140,7 +140,7 @@ atVec4f CVar::toVec4f(bool* isValid) const
return atVec4f{};
}
if (isValid != NULL)
if (isValid != nullptr)
*isValid = true;
atVec4f vec;
@@ -346,7 +346,7 @@ bool CVar::fromLiteral(std::wstring_view val)
return true;
}
bool CVar::fromLiteralToType(std::string_view val)
bool CVar::fromLiteralToType(std::string_view val, bool setDefault)
{
switch (m_type)
{
@@ -382,10 +382,12 @@ bool CVar::fromLiteralToType(std::string_view val)
return fromVec4f(vec);
}
}
if (setDefault)
m_value = m_defaultValue;
return false;
}
bool CVar::fromLiteralToType(std::wstring_view val)
bool CVar::fromLiteralToType(std::wstring_view val, bool setDefault)
{
switch (m_type)
{
@@ -421,6 +423,8 @@ bool CVar::fromLiteralToType(std::wstring_view val)
return fromVec4f(vec);
}
}
if (setDefault)
m_value = m_defaultValue;
return false;
}
@@ -435,6 +439,12 @@ bool CVar::isHidden() const { return int(m_flags & EFlags::Hidden) != 0; }
bool CVar::isArchive() const { return int(m_flags & EFlags::Archive) != 0; }
bool CVar::isInternalArchivable() const { return int(m_flags & EFlags::InternalArchivable) != 0; }
bool CVar::wasDeserialized() const { return m_wasDeserialized; }
bool CVar::hasDefaultValue() const { return m_defaultValue == m_value; }
void CVar::clearModified()
{
if (!modificationRequiresRestart())