AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CRandom16: Make constructor explicit 

Same behavior, minus the implicit conversions upon construction.
This commit is contained in:
Lioncash 2020-04-11 15:35:44 -04:00
parent 01bb0f3840
commit 065c908bc5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CRandom16.hpp
View File

@ -9,7 +9,7 @@ class CRandom16 {
static CRandom16* g_randomNumber; static CRandom16* g_randomNumber;
public: public:
CRandom16(s32 p = 99) : m_seed(p) {} explicit CRandom16(s32 seed = 99) : m_seed(seed) {}
s32 Next() { s32 Next() {
m_seed = (m_seed * 0x41c64e6d) + 0x00003039; m_seed = (m_seed * 0x41c64e6d) + 0x00003039;
@ -18,7 +18,7 @@ public:
s32 GetSeed() const { return m_seed; } s32 GetSeed() const { return m_seed; }
void SetSeed(s32 p) { m_seed = p; } void SetSeed(s32 seed) { m_seed = seed; }
float Float() { return Next() * 0.000015259022f; } float Float() { return Next() * 0.000015259022f; }

2
Runtime/Graphics/CRainSplashGenerator.hpp
View File

@ -44,7 +44,7 @@ class CRainSplashGenerator {
void SetPoint(const zeus::CVector3f& pos); void SetPoint(const zeus::CVector3f& pos);
}; };
std::vector<SRainSplash> x0_rainSplashes; std::vector<SRainSplash> x0_rainSplashes;
CRandom16 x10_random = {99}; CRandom16 x10_random{99};
zeus::CVector3f x14_scale; zeus::CVector3f x14_scale;
float x20_generateTimer = 0.0f; float x20_generateTimer = 0.0f;
float x24_generateInterval = 0.0f; float x24_generateInterval = 0.0f;

2
Runtime/Weapon/CNewFlameThrower.hpp
View File

@ -10,7 +10,7 @@
namespace urde { namespace urde {
class CNewFlameThrower : public CGameProjectile { class CNewFlameThrower : public CGameProjectile {
CRandom16 x2e8_rand = {99}; CRandom16 x2e8_rand{99};
float x2ec_ = 0.f; float x2ec_ = 0.f;
float x2f0_ = 0.f; float x2f0_ = 0.f;
bool x300_ = false; bool x300_ = false;

2
Runtime/Weapon/CWaveBuster.hpp
View File

@ -26,7 +26,7 @@ class CWaveBuster : public CGameProjectile {
std::unique_ptr<CParticleSwoosh> x388_busterSwoosh2Gen; std::unique_ptr<CParticleSwoosh> x388_busterSwoosh2Gen;
std::unique_ptr<CElementGen> x38c_busterSparksGen; std::unique_ptr<CElementGen> x38c_busterSparksGen;
std::unique_ptr<CElementGen> x390_busterLightGen; std::unique_ptr<CElementGen> x390_busterLightGen;
CRandom16 x394_rand = {99}; CRandom16 x394_rand{99};
float x39c_ = 0.5f; float x39c_ = 0.5f;
float x3a0_ = 0.5f; float x3a0_ = 0.5f;
float x3a4_ = 0.f; float x3a4_ = 0.f;

2
Runtime/World/CMorphBall.hpp
View File

@ -111,7 +111,7 @@ private:
std::unique_ptr<CElementGen> x19e0_effect_morphBallIceBreakGen; std::unique_ptr<CElementGen> x19e0_effect_morphBallIceBreakGen;
rstl::reserved_vector<std::pair<std::unique_ptr<CParticleSwoosh>, bool>, 32> x19e4_spiderElectricGens; rstl::reserved_vector<std::pair<std::unique_ptr<CParticleSwoosh>, bool>, 32> x19e4_spiderElectricGens;
std::list<CSpiderBallElectricityManager> x1b6c_activeSpiderElectricList; std::list<CSpiderBallElectricityManager> x1b6c_activeSpiderElectricList;
CRandom16 x1b80_rand = {99}; CRandom16 x1b80_rand{99};
rstl::reserved_vector<TToken<CGenDescription>, 8> x1b84_wakeEffects; rstl::reserved_vector<TToken<CGenDescription>, 8> x1b84_wakeEffects;
rstl::reserved_vector<std::unique_ptr<CElementGen>, 8> x1bc8_wakeEffectGens; rstl::reserved_vector<std::unique_ptr<CElementGen>, 8> x1bc8_wakeEffectGens;
s32 x1c0c_wakeEffectIdx = -1; s32 x1c0c_wakeEffectIdx = -1;