AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 19:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Remove arbitrary particle limit of 256, unfortunately this breaks various particle systems including Essence Shockwave and flamethrower particles"

Browse Source 
This reverts commit 35482529
This commit is contained in:
Luke Street
2021-02-15 21:54:44 -05:00
parent 5f263b8a4f
commit 732831de9a
4 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/Particle/CElementGen.hpp
View File

@@ -65,6 +65,7 @@ private:
bool x88_particleEmission = true;
float x8c_generatorRemainder = 0.f;
int x90_MAXP = 0;
int m_maxMAXP = 256;
u16 x94_randomSeed = g_GlobalSeed;
float x98_generatorRate = 1.f;
std::array<float, 16> x9c_externalVars{};
@@ -100,6 +101,7 @@ private:
bool x26d_27_enableOPTS : 1;
bool x26d_28_enableADV : 1 = false;
int x270_MBSP = 0;
int m_maxMBSP = 0;
ERglLightBits x274_backupLightActive = ERglLightBits::None;
std::array<bool, 4> x278_hasVMD{};
CRandom16 x27c_randState;
@@ -223,6 +225,7 @@ public:
static void SetMoveRedToAlphaBuffer(bool move);
s32 GetMaxParticles() const { return x90_MAXP; }
s32 GetMaxMaxParticles() const { return m_maxMAXP; }
std::vector<CParticle> const& GetParticles() const { return x30_particles; }
std::vector<CParticle> &GetParticles() { return x30_particles; }