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

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Particle/CDecalManager.cpp
View File

@@ -21,7 +21,7 @@ void CDecalManager::Initialize() {
m_DecalPool.clear();
for (int i = 0; i < 64; ++i)
m_DecalPool.emplace_back(rstl::optional<CDecal>{}, 0, i - 1, false);
m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false);
m_FreeIndex = 63;
m_PoolInitialized = true;
@@ -39,7 +39,7 @@ void CDecalManager::Reinitialize() {
m_DecalPool.clear();
for (int i = 0; i < 64; ++i)
m_DecalPool.emplace_back(rstl::optional<CDecal>{}, 0, i - 1, false);
m_DecalPool.emplace_back(std::optional<CDecal>{}, 0, i - 1, false);
m_ActiveIndexList.clear();