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

Merge branch 'master' into urde-tags

Browse Source
This commit is contained in:
Jack Andersen
2016-03-04 14:03:41 -10:00
parent 8c9eca1858 783fb4c4fe
commit 9ade279902
337 changed files with 2998 additions and 3016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/CTweaks.cpp
View File

@@ -1,4 +1,4 @@
#include <LogVisor/LogVisor.hpp>
#include "logvisor/logvisor.hpp"
#include "CTweaks.hpp"
#include "CResFactory.hpp"
#include "CResLoader.hpp"
@@ -7,7 +7,7 @@
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp"
#include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp"
namespace pshag
namespace urde
{
DataSpec::ITweakGame* g_tweakGame = nullptr;
DataSpec::ITweakPlayer* g_tweakPlayer = nullptr;
@@ -16,13 +16,13 @@ DataSpec::ITweakPlayerControl* g_tweakPlayerControl = nullptr;
namespace MP1
{
LogVisor::LogModule Log("MP1::CTweaks");
static logvisor::Module Log("MP1::CTweaks");
static const SObjectTag& IDFromFactory(CResFactory& factory, const char* name)
{
const SObjectTag* tag = factory.GetResourceIdByName(name);
if (!tag)
Log.report(LogVisor::FatalError, "Tweak Asset not found when loading... '%s'", name);
Log.report(logvisor::Fatal, "Tweak Asset not found when loading... '%s'", name);
return *tag;
}