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

Merge branch 'master' into omegapirate

Browse Source 
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
This commit is contained in:
Luke Street
2020-04-19 22:12:18 -04:00
parent de5513e277 1fd28d3fc3
commit 32c44cbf05
37 changed files with 149 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Particle/CParticleDataFactory.hpp
View File

@@ -8,6 +8,7 @@
#include "Runtime/IOStreams.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/CModel.hpp"
namespace urde {
class CColorElement;
@@ -16,7 +17,6 @@ class CEmitterElement;
class CGenDescription;
class CIntElement;
class CModVectorElement;
class CModel;
class CRealElement;
class CSimplePool;
class CSwooshDescription;
@@ -100,3 +100,9 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const
CObjectReference* selfRef);
} // namespace urde
// FIXME hacky workaround for MSVC; these need to be complete types
// but introduce circular dependencies if included at the start
#include "Runtime/Particle/CGenDescription.hpp"
#include "Runtime/Particle/CSwooshDescription.hpp"
#include "Runtime/Particle/CElectricDescription.hpp"