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

Resource factories now provided with self-ref

Browse Source
This commit is contained in:
Jack Andersen
2016-09-02 09:32:57 -10:00
parent 6dff9b241a
commit f4ea728a61
43 changed files with 201 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/CToken.hpp
View File

@@ -74,7 +74,7 @@ class CObjectReference
if (!x10_object && !x3_loading)
{
IFactory& fac = xC_objectStore->GetFactory();
fac.BuildAsync(x4_objTag, x14_params, &x10_object);
fac.BuildAsync(x4_objTag, x14_params, &x10_object, this);
x3_loading = true;
}
}
@@ -102,7 +102,7 @@ class CObjectReference
if (!x10_object)
{
IFactory& factory = xC_objectStore->GetFactory();
x10_object = factory.Build(x4_objTag, x14_params).release();
x10_object = factory.Build(x4_objTag, x14_params, this).release();
}
x3_loading = false;
return x10_object;
@@ -128,6 +128,7 @@ public:
class CToken
{
friend class CSimplePool;
friend class CModel;
CObjectReference* x0_objRef = nullptr;
bool x4_lockHeld = false;