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

Prelim CPlayer imps, fix race condition in CGameGlobalObjects

Browse Source
This commit is contained in:
Phillip Stephens
2016-09-25 09:45:22 -07:00
parent ae4f770ca2
commit 23b6bd350e
24 changed files with 2820 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/MP1/MP1.hpp
View File

@@ -47,7 +47,7 @@ namespace MP1
{
class CGameGlobalObjects
{
CMemoryCardSys x0_memoryCardSys;
std::unique_ptr<CMemoryCardSys> x0_memoryCardSys;
IFactory& x4_resFactory;
CSimplePool& xcc_simplePool;
CCharacterFactoryBuilder xec_charFactoryBuilder;
@@ -71,8 +71,9 @@ public:
CSimplePool& objStore)
: x4_resFactory(resFactory), xcc_simplePool(objStore)
{
g_MemoryCardSys = &x0_memoryCardSys;
g_ResFactory = &x4_resFactory;
x0_memoryCardSys.reset(new CMemoryCardSys());
g_MemoryCardSys = x0_memoryCardSys.get();
g_SimplePool = &xcc_simplePool;
g_CharFactoryBuilder = &xec_charFactoryBuilder;
g_AiFuncMap = &x110_aiFuncMap;