Moved Log to Common and made some changes to log formatting

src/Core/Resource/CAnimationParameters.cpp

@@ -1,7 +1,7 @@
 #include "CAnimationParameters.h"
 #include "CAnimSet.h"
 #include "CResCache.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 
 CAnimationParameters::CAnimationParameters()

src/Core/Resource/CResCache.cpp

@@ -9,7 +9,7 @@
 #include "Core/Resource/Factory/CStringLoader.h"
 #include "Core/Resource/Factory/CTextureDecoder.h"
 #include "Core/Resource/Factory/CWorldLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 #include <Common/TString.h>
 #include <FileIO/FileIO.h>

src/Core/Resource/Cooker/CAreaCooker.cpp

@@ -1,6 +1,6 @@
 #include "CAreaCooker.h"
 #include "CScriptCooker.h"
-#include <Core/Log.h>
+#include <Common/Log.h>
 
 CAreaCooker::CAreaCooker()
 {

src/Core/Resource/Factory/CAnimSetLoader.cpp

@@ -1,6 +1,6 @@
 #include "CAnimSetLoader.h"
 #include "Core/Resource/CResCache.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 CAnimSetLoader::CAnimSetLoader()
 {
@@ -75,7 +75,6 @@ void CAnimSetLoader::LoadPASDatabase(IInputStream& PAS4)
 CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& ANCS)
 {
     if (!ANCS.IsValid()) return nullptr;
-    Log::Write("Loading " + ANCS.GetSourceString());
 
     u32 magic = ANCS.ReadLong();
     if (magic != 0x00010001)
@@ -172,7 +171,6 @@ CAnimSet* CAnimSetLoader::LoadANCS(IInputStream& ANCS)
 CAnimSet* CAnimSetLoader::LoadCHAR(IInputStream &CHAR)
 {
     if (!CHAR.IsValid()) return nullptr;
-    Log::Write("Loading " + CHAR.GetSourceString());
 
     CAnimSetLoader loader;
     u8 check = CHAR.ReadByte();

src/Core/Resource/Factory/CAreaLoader.cpp

@@ -3,7 +3,7 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
 #include "CScriptLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 #include <Common/CFourCC.h>
 #include <Common/CompressionUtil.h>
@@ -613,7 +613,6 @@ CGameArea* CAreaLoader::LoadMREA(IInputStream& MREA)
 
     // Validation
     if (!MREA.IsValid()) return nullptr;
-    Log::Write("Loading " + MREA.GetSourceString());
 
     u32 deadbeef = MREA.ReadLong();
     if (deadbeef != 0xdeadbeef)

src/Core/Resource/Factory/CCollisionLoader.cpp

@@ -1,5 +1,5 @@
 #include "CCollisionLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 
 CCollisionLoader::CCollisionLoader()

src/Core/Resource/Factory/CFontLoader.cpp

@@ -1,5 +1,5 @@
 #include "CFontLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 
 CFontLoader::CFontLoader()
@@ -82,7 +82,6 @@ CFont* CFontLoader::LoadFont(IInputStream& FONT)
 CFont* CFontLoader::LoadFONT(IInputStream& FONT)
 {
     if (!FONT.IsValid()) return nullptr;
-    Log::Write("Loading " + FONT.GetSourceString());
 
     CFourCC Magic(FONT);
     if (Magic != "FONT")

src/Core/Resource/Factory/CMaterialLoader.cpp

@@ -1,7 +1,7 @@
 #include "CMaterialLoader.h"
 #include "Core/Resource/CResCache.h"
 #include "Core/OpenGL/GLCommon.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 #include <iomanip>
 

src/Core/Resource/Factory/CModelLoader.cpp

@@ -1,6 +1,6 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <map>
 
 CModelLoader::CModelLoader()
@@ -382,7 +382,6 @@ SSurface* CModelLoader::LoadAssimpMesh(const aiMesh *pMesh, CMaterialSet *pSet)
 CModel* CModelLoader::LoadCMDL(IInputStream& CMDL)
 {
     CModelLoader Loader;
-    Log::Write("Loading " + CMDL.GetSourceString());
 
     // CMDL header - same across the three Primes, but different structure in DKCR
     u32 Magic = CMDL.ReadLong();

src/Core/Resource/Factory/CScanLoader.cpp

@@ -1,6 +1,6 @@
 #include "CScanLoader.h"
 #include "Core/Resource/CResCache.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 CScanLoader::CScanLoader()
 {
@@ -142,7 +142,6 @@ void CScanLoader::LoadParamsMP3(IInputStream& SCAN)
 CScan* CScanLoader::LoadSCAN(IInputStream &SCAN)
 {
     if (!SCAN.IsValid()) return nullptr;
-    Log::Write("Loading " + SCAN.GetSourceString());
 
     /* Switching to EGame enum here isn't really useful unfortunately
      * because the MP1 demo can be 1, 2, or 3, while MP1 is 5 and MP2+ is 2

src/Core/Resource/Factory/CScriptLoader.cpp

@@ -2,7 +2,7 @@
 #include "CTemplateLoader.h"
 #include "Core/Resource/Script/CMasterTemplate.h"
 #include "Core/Resource/CResCache.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 #include <sstream>
 

src/Core/Resource/Factory/CStringLoader.cpp

@@ -1,5 +1,5 @@
 #include "CStringLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 CStringLoader::CStringLoader()
 {
@@ -162,7 +162,6 @@ CStringTable* CStringLoader::LoadSTRG(IInputStream& STRG)
 {
     // Verify that this is a valid STRG
     if (!STRG.IsValid()) return nullptr;
-    Log::Write("Loading " + STRG.GetSourceString());
 
     u32 Magic = STRG.ReadLong();
     EGame Version = eUnknownVersion;

src/Core/Resource/Factory/CTemplateLoader.cpp

@@ -1,7 +1,7 @@
 #include "CTemplateLoader.h"
 #include "CAreaLoader.h"
 #include "Core/Resource/Script/IPropertyTemplate.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <boost/filesystem.hpp>
 
 const TString CTemplateLoader::mskTemplatesDir = "../templates/";

src/Core/Resource/Factory/CTextureDecoder.cpp

@@ -1,5 +1,5 @@
 #include "CTextureDecoder.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <Common/CColor.h>
 
 // A cleanup is warranted at some point. Trying to support both partial + full decode ended up really messy.
@@ -127,7 +127,6 @@ CTexture* CTextureDecoder::DoFullDecode(CTexture*)
 void CTextureDecoder::ReadTXTR(IInputStream& TXTR)
 {
     // Read TXTR header
-    Log::Write("Loading " + TXTR.GetSourceString());
     mTexelFormat = ETexelFormat(TXTR.ReadLong());
     mWidth = TXTR.ReadShort();
     mHeight = TXTR.ReadShort();
@@ -151,8 +150,6 @@ void CTextureDecoder::ReadTXTR(IInputStream& TXTR)
 
 void CTextureDecoder::ReadDDS(IInputStream& DDS)
 {
-    Log::Write("Loading " + DDS.GetSourceString());
-
     // Header
     CFourCC Magic(DDS);
     if (Magic != "DDS ")

src/Core/Resource/Factory/CWorldLoader.cpp

@@ -1,6 +1,6 @@
 #include "CWorldLoader.h"
 #include "Core/Resource/CResCache.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include <iostream>
 
 CWorldLoader::CWorldLoader()
@@ -285,7 +285,6 @@ void CWorldLoader::LoadReturnsMLVL(IInputStream& MLVL)
 CWorld* CWorldLoader::LoadMLVL(IInputStream& MLVL)
 {
     if (!MLVL.IsValid()) return nullptr;
-    Log::Write("Loading " + MLVL.GetSourceString());
 
     u32 Magic = MLVL.ReadLong();
     if (Magic != 0xDEAFBABE)

src/Core/Resource/Script/CMasterTemplate.cpp

@@ -1,6 +1,6 @@
 #include "CMasterTemplate.h"
 #include "Core/Resource/Factory/CWorldLoader.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 CMasterTemplate::CMasterTemplate()
 {

src/Core/Resource/Script/CScriptTemplate.cpp

@@ -3,7 +3,7 @@
 #include "CMasterTemplate.h"
 #include "Core/Resource/CResCache.h"
 #include "Core/Resource/CAnimSet.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 
 #include <iostream>
 #include <string>

src/Core/Resource/Script/IPropertyValue.h

@@ -2,7 +2,7 @@
 #define IPROPERTYVALUE_H
 
 #include "EPropertyType.h"
-#include "Core/Log.h"
+#include <Common/Log.h>
 #include "Core/Resource/CAnimationParameters.h"
 #include "Core/Resource/CResource.h"
 #include "Core/Resource/CResourceInfo.h"