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

Better handling for logging CVar

This commit is contained in:
Phillip Stephens 2018-06-12 20:20:49 -07:00
parent cfb01b80f0
commit 4d8cf17078
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/CStateManager.cpp
View File

@ -58,6 +58,7 @@
namespace urde namespace urde
{ {
hecl::CVar* sm_logScripting = nullptr;
logvisor::Module LogModule("urde::CStateManager"); logvisor::Module LogModule("urde::CStateManager");
CStateManager::CStateManager(const std::weak_ptr<CRelayTracker>& relayTracker, CStateManager::CStateManager(const std::weak_ptr<CRelayTracker>& relayTracker,
const std::weak_ptr<CMapWorldInfo>& mwInfo, const std::weak_ptr<CMapWorldInfo>& mwInfo,
@ -215,7 +216,7 @@ CStateManager::CStateManager(const std::weak_ptr<CRelayTracker>& relayTracker,
x8f0_shadowTex = g_SimplePool->GetObj("DefaultShadow"); x8f0_shadowTex = g_SimplePool->GetObj("DefaultShadow");
g_StateManager = this; g_StateManager = this;
hecl::CVarManager::instance()->findOrMakeCVar("stateManager.logScripting"sv, "Prints object communication to the console", false, hecl::CVar::EFlags::ReadOnly | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::Game); sm_logScripting = hecl::CVarManager::instance()->findOrMakeCVar("stateManager.logScripting"sv, "Prints object communication to the console", false, hecl::CVar::EFlags::ReadOnly | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::Game);
} }
CStateManager::~CStateManager() CStateManager::~CStateManager()
@ -1093,9 +1094,8 @@ void CStateManager::SendScriptMsg(CEntity* dest, TUniqueId src, EScriptObjectMes
{ {
if (dest && !dest->x30_26_scriptingBlocked) if (dest && !dest->x30_26_scriptingBlocked)
{ {
const hecl::CVar* logScripting = hecl::CVarManager::instance()->findCVar("stateManager.logScripting"sv); if (sm_logScripting && sm_logScripting->toBoolean())
if (logScripting && logScripting->toBoolean()) LogModule.report(logvisor::Info, "Sending '%s' to '%s' id= 0x%.4X",
LogModule.report(logvisor::Info, "Sending '%s' to '%s' id= 0x%.4X\n",
ScriptObjectMessageToStr(msg).data(), dest->GetName().data(), dest->GetUniqueId().id); ScriptObjectMessageToStr(msg).data(), dest->GetName().data(), dest->GetUniqueId().id);
dest->AcceptScriptMsg(msg, src, *this); dest->AcceptScriptMsg(msg, src, *this);
} }
@ -1112,10 +1112,9 @@ void CStateManager::SendScriptMsgAlways(TUniqueId dest, TUniqueId src, EScriptOb
CEntity* dst = ObjectById(dest); CEntity* dst = ObjectById(dest);
if (dst) if (dst)
{ {
#ifndef NDEBUG if (sm_logScripting && sm_logScripting->toBoolean())
LogModule.report(logvisor::Info, "Sending '%s' to '%s' id= 0x%.4X\n", LogModule.report(logvisor::Info, "Sending '%s' to '%s' id= 0x%.4X",
ScriptObjectMessageToStr(msg).data(), dst->GetName().data(), dst->GetUniqueId().id); ScriptObjectMessageToStr(msg).data(), dst->GetName().data(), dst->GetUniqueId().id);
#endif
dst->AcceptScriptMsg(msg, src, *this); dst->AcceptScriptMsg(msg, src, *this);
} }
} }
@ -1178,9 +1177,8 @@ void CStateManager::FreeScriptObject(TUniqueId id)
act->SetUseInSortedLists(false); act->SetUseInSortedLists(false);
} }
#ifndef NDEBUG if (sm_logScripting && sm_logScripting->toBoolean())
LogModule.report(logvisor::Info, "Removed '%s'", ent->GetName().data()); LogModule.report(logvisor::Info, "Removed '%s'", ent->GetName().data());
#endif
} }
std::pair<const SScriptObjectStream*, TEditorId> CStateManager::GetBuildForScript(TEditorId id) const std::pair<const SScriptObjectStream*, TEditorId> CStateManager::GetBuildForScript(TEditorId id) const
@ -2561,9 +2559,9 @@ void CStateManager::AddObject(CEntity& ent)
SendScriptMsg(&ent, kInvalidUniqueId, EScriptObjectMessage::InitializedInArea); SendScriptMsg(&ent, kInvalidUniqueId, EScriptObjectMessage::InitializedInArea);
} }
#ifndef NDEBUG
if (sm_logScripting && sm_logScripting->toBoolean())
LogModule.report(logvisor::Info, "Added '%s'", ent.GetName().data()); LogModule.report(logvisor::Info, "Added '%s'", ent.GetName().data());
#endif
} }
void CStateManager::AddObject(CEntity* ent) void CStateManager::AddObject(CEntity* ent)

4
Runtime/MP1/MP1.cpp
View File

@ -113,8 +113,8 @@ CGameArchitectureSupport::CGameArchitectureSupport(CMain& parent,
CStreamAudioManager::SetMusicVolume(0x7f); CStreamAudioManager::SetMusicVolume(0x7f);
m->ResetGameState(); m->ResetGameState();
std::shared_ptr<CIOWin> splash = std::make_shared<CSplashScreen>(CSplashScreen::ESplashScreen::Nintendo); //std::shared_ptr<CIOWin> splash = std::make_shared<CSplashScreen>(CSplashScreen::ESplashScreen::Nintendo);
x58_ioWinManager.AddIOWin(splash, 1000, 10000); //x58_ioWinManager.AddIOWin(splash, 1000, 10000);
std::shared_ptr<CIOWin> mf = std::make_shared<CMainFlow>(); std::shared_ptr<CIOWin> mf = std::make_shared<CMainFlow>();
x58_ioWinManager.AddIOWin(mf, 0, 0); x58_ioWinManager.AddIOWin(mf, 0, 0);

2
hecl

@ -1 +1 @@
Subproject commit 01d4e0621e749a090d5d0bc992f529fcb714aab9 Subproject commit d6e7abc61fb51a665bf954db03798c23e1ae5f57