AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Registration fix for Vec*CVar and StringCVar

This commit is contained in:
Phillip Stephens 2018-01-15 07:58:40 -08:00
parent 8cef2f5192
commit da5ba6cdf3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hecl/include/hecl/CVarManager.hpp
View File

@ -18,18 +18,19 @@ class FileStoreManager;
} }
class CVarManager final class CVarManager final
{ {
template <typename T> CVar* _newCVar(CVar* cvar)
CVar* _newCVar(std::string_view name, std::string_view help, T& value, CVar::EFlags flags)
{ {
TCVar<T>* ret = new TCVar<T>(value, name, help, flags); if (registerCVar(cvar))
if (registerCVar(ret))
{ {
deserialize(ret); deserialize(cvar);
return ret; return cvar;
} }
delete ret; delete cvar;
return nullptr; return nullptr;
} }
template <typename T>
CVar* _newCVar(std::string_view name, std::string_view help, T& value, CVar::EFlags flags)
{ return _newCVar(new TCVar<T>(value, name, help, flags)); }
hecl::Runtime::FileStoreManager& m_store; hecl::Runtime::FileStoreManager& m_store;
std::string m_configFile = "config"; std::string m_configFile = "config";
@ -47,15 +48,15 @@ public:
void update(); void update();
CVar* newCVar(std::string_view name, std::string_view help, atVec3f& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, atVec3f& value, CVar::EFlags flags)
{ return new Vec3fCVar(value, name, help, flags); } { return _newCVar(new Vec3fCVar(value, name, help, flags)); }
CVar* newCVar(std::string_view name, std::string_view help, atVec3d& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, atVec3d& value, CVar::EFlags flags)
{ return new Vec3dCVar(value, name, help, flags); } { return _newCVar(new Vec3dCVar(value, name, help, flags)); }
CVar* newCVar(std::string_view name, std::string_view help, atVec4f& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, atVec4f& value, CVar::EFlags flags)
{ return new Vec4fCVar(value, name, help, flags); } { return _newCVar(new Vec4fCVar(value, name, help, flags)); }
CVar* newCVar(std::string_view name, std::string_view help, atVec4d& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, atVec4d& value, CVar::EFlags flags)
{ return new Vec4dCVar(value, name, help, flags); } { return _newCVar(new Vec4dCVar(value, name, help, flags)); }
CVar* newCVar(std::string_view name, std::string_view help, std::string& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, std::string& value, CVar::EFlags flags)
{ return new StringCVar(value, name, help, flags); } { return _newCVar(new StringCVar(value, name, help, flags)); }
CVar* newCVar(std::string_view name, std::string_view help, bool& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, bool& value, CVar::EFlags flags)
{ return _newCVar<bool>(name, help, value, flags); } { return _newCVar<bool>(name, help, value, flags); }
CVar* newCVar(std::string_view name, std::string_view help, float& value, CVar::EFlags flags) CVar* newCVar(std::string_view name, std::string_view help, float& value, CVar::EFlags flags)

1
hecl/include/hecl/Console.hpp
View File

@ -95,6 +95,7 @@ public:
void dumpLog(); void dumpLog();
static Console* instance(); static Console* instance();
static void RegisterLogger(Console* con); static void RegisterLogger(Console* con);
bool isOpen() { return m_state == State::Opened; }
}; };
} }