link fix

DataSpec/DNAMP1/STRG.cpp

@@ -111,7 +111,6 @@ void STRG::write(Athena::io::IStreamWriter& writer) const
 
 void STRG::fromYAML(Athena::io::YAMLDocReader& reader)
 {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> wconv;
     const Athena::io::YAMLNode* root = reader.getRootNode();
 
     /* Validate Pass */
@@ -151,7 +150,7 @@ void STRG::fromYAML(Athena::io::YAMLDocReader& reader)
     {
         std::vector<std::wstring> strs;
         for (const auto& str : lang.second->m_seqChildren)
-            strs.emplace_back(wconv.from_bytes(str->m_scalarString));
+            strs.emplace_back(HECL::UTF8ToWide(str->m_scalarString));
         langs.emplace_back(FourCC(lang.first.c_str()), strs);
     }
 

DataSpec/DNAMP2/STRG.cpp

@@ -139,7 +139,6 @@ void STRG::write(Athena::io::IStreamWriter& writer) const
 
 void STRG::fromYAML(Athena::io::YAMLDocReader& reader)
 {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> wconv;
     const Athena::io::YAMLNode* root = reader.getRootNode();
 
     /* Validate Pass */
@@ -181,7 +180,7 @@ void STRG::fromYAML(Athena::io::YAMLDocReader& reader)
     {
         std::vector<std::wstring> strs;
         for (const auto& str : lang.second->m_seqChildren)
-            strs.emplace_back(wconv.from_bytes(str->m_scalarString));
+            strs.emplace_back(HECL::UTF8ToWide(str->m_scalarString));
         langs.emplace_back(FourCC(lang.first.c_str()), strs);
     }
 

NODLib

@@ -1 +1 @@
-Subproject commit 28ed4ba6afe64b1e529799bfb8d87c35fe868e4c
+Subproject commit 83b96b1bc2fd524916a32e5060b637fed0296e31

Runtime/CDvdFile.hpp

@@ -23,26 +23,26 @@ class CDvdFile
     friend class CResLoader;
     std::string x18_name;
 public:
-    CDvdFile(const char*);
+    CDvdFile(const char*) {}
-    void UpdateFilePos(int);
+    void UpdateFilePos(int) {}
-    void CalcFileOffset(int, ESeekOrigin);
+    void CalcFileOffset(int, ESeekOrigin) {}
-    static void internalCallback(s32, DVDFileInfo*);
+    static void internalCallback(s32, DVDFileInfo*) {}
-    static bool FileExists(const char*);
+    static bool FileExists(const char*) {}
-    void CloseFile();
+    void CloseFile() {}
-    CDvdRequest* AsyncSeekRead(void*, u32, ESeekOrigin, int);
+    CDvdRequest* AsyncSeekRead(void*, u32, ESeekOrigin, int) {}
-    void SyncSeekRead(void*, u32, ESeekOrigin, int);
+    void SyncSeekRead(void*, u32, ESeekOrigin, int) {}
-    CDvdRequest* AsyncRead(void*, u32);
+    CDvdRequest* AsyncRead(void*, u32) {}
-    void SyncRead(void*, u32);
+    void SyncRead(void*, u32) {}
-    void StallForARAMFile();
+    void StallForARAMFile() {}
-    void StartARAMFileLoad();
+    void StartARAMFileLoad() {}
-    void PopARAMFileLoad();
+    void PopARAMFileLoad() {}
-    void PushARAMFileLoad();
+    void PushARAMFileLoad() {}
-    void TryARAMFile();
+    void TryARAMFile() {}
-    void PingARAMTransfer();
+    void PingARAMTransfer() {}
-    void HandleDVDInterrupt();
+    void HandleDVDInterrupt() {}
-    void HandleARAMInterrupt();
+    void HandleARAMInterrupt() {}
-    static void ARAMARAMXferCallback(u32);
+    static void ARAMARAMXferCallback(u32) {}
-    static void DVDARAMXferCallback(s32, DVDFileInfo*);
+    static void DVDARAMXferCallback(s32, DVDFileInfo*) {}
 };
 
 }

Runtime/CMemory.cpp

@@ -71,10 +71,14 @@ IAllocator& CMemorySys::GetGameAllocator() {return g_gameAllocator;}
 
 }
 
-void* operator new(std::size_t)
+void* operator new(std::size_t sz)
 {
-    extern void *bare_new_erroneously_called();
+    Retro::CCallStack cs("?\?(?\?)", "UnknownType");
-    return bare_new_erroneously_called();
+    return Retro::CMemory::Alloc(sz,
+                                 Retro::IAllocator::HintNone,
+                                 Retro::IAllocator::ScopeDefault,
+                                 Retro::IAllocator::TypePrimitive,
+                                 cs);
 }
 
 void* operator new(std::size_t sz,
@@ -93,10 +97,14 @@ void operator delete(void* ptr) noexcept
     Retro::CMemory::Free(ptr);
 }
 
-void* operator new[](std::size_t)
+void* operator new[](std::size_t sz)
 {
-    extern void *bare_new_array_erroneously_called();
+    Retro::CCallStack cs("?\?(?\?)", "UnknownType");
-    return bare_new_array_erroneously_called();
+    return Retro::CMemory::Alloc(sz,
+                                 Retro::IAllocator::HintNone,
+                                 Retro::IAllocator::ScopeDefault,
+                                 Retro::IAllocator::TypeArray,
+                                 cs);
 }
 
 void* operator new[](std::size_t sz,

Runtime/CPakFile.hpp

@@ -35,7 +35,7 @@ private:
     std::vector<u32> x5c_depList;
     std::vector<std::pair<u32, SResInfo>> x6c_resList;
 public:
-    CPakFile(const std::string& filename, bool flag);
+    CPakFile(const std::string& filename, bool flag) : CDvdFile(filename.c_str()) {}
     const std::vector<u32>& GetDepList() const {return x5c_depList;}
     u32 GetResIdByName(const char* name) const
     {
@@ -44,12 +44,12 @@ public:
                 return p.second.id;
         return 0;
     }
-    const SResInfo* GetResInfoForLoad(u32 id);
+    const SResInfo* GetResInfoForLoad(u32 id) {}
-    const SResInfo* GetResInfo(u32 id) const;
+    const SResInfo* GetResInfo(u32 id) const {}
-    u32 GetFakeStaticSize() const;
+    u32 GetFakeStaticSize() const {}
-    void DataLoad();
+    void DataLoad() {}
-    void InitialHeaderLoad();
+    void InitialHeaderLoad() {}
-    void Warmup();
+    void Warmup() {}
     void AsyncIdle()
     {
         if (x2c_asyncLoadPhase == PakAsyncLoaded)

Runtime/CSimplePool.hpp

@@ -13,6 +13,15 @@ public:
     CSimplePool(IFactory&)
     {
     }
+    IObj& GetObj(const SObjectTag&, const CVParamTransfer&) {}
+    IObj& GetObj(const SObjectTag&) {}
+    IObj& GetObj(char const*) {}
+    IObj& GetObj(char const*, const CVParamTransfer&) {}
+    void HasObject(const SObjectTag&) const {}
+    void ObjectIsLive(const SObjectTag&) const {}
+    IFactory& GetFactory() const {}
+    void Flush() {}
+    void ObjectUnreferenced(const SObjectTag&) {}
 };
 
 }

Runtime/Character/CAssetFactory.hpp

@@ -7,6 +7,12 @@ namespace Retro
 {
 class CCharacterFactoryBuilder : public IFactory
 {
+public:
+    std::unique_ptr<IObj> Build(const SObjectTag&, const CVParamTransfer&) {}
+    void BuildAsync(const SObjectTag&, const CVParamTransfer&, IObj**) {}
+    void CancelBuild(const SObjectTag&) {}
+    bool CanBuild(const SObjectTag&) {}
+    u32 GetResourceIdByName(const char*) const {}
 };
 }
 

Runtime/MP1/CMakeLists.txt

@@ -9,5 +9,6 @@ target_link_libraries(mp1
                       RuntimeCommon
                       DNAMP1
                       DNACommon
-                      Boo
+                      HECLDatabase HECLBlender HECLCommon AthenaCore NOD
+                      LogVisor AthenaLibYaml Boo png squish blowfish z lzo2 pthread
                       ${BOO_SYS_LIBS})

hecl

@@ -1 +1 @@
-Subproject commit cba8336d73c7ea0dd8f673881a6a6d8d4ec5af34
+Subproject commit b80f351d65b15d9a0ffe28625d69f718be074257

libBoo

@@ -1 +1 @@
-Subproject commit 3a6dd3f6b8277ffc0a3a34a933006176024c900a
+Subproject commit d69e76d911198e060b825000cc4e8ce9273df537