mirror of https://github.com/AxioDL/metaforce.git
Compile fixes
This commit is contained in:
parent
30fb3827cd
commit
9b816d471b
|
@ -34,10 +34,10 @@ struct SAdsrData {
|
||||||
bool x18_24_hasSustain : 1;
|
bool x18_24_hasSustain : 1;
|
||||||
bool x18_25_autoRelease : 1;
|
bool x18_25_autoRelease : 1;
|
||||||
};
|
};
|
||||||
u8 dummy = 0;
|
u32 dummy = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
constexpr SAdsrData() noexcept = default;
|
constexpr SAdsrData() noexcept { x18_24_hasSustain = false; x18_25_autoRelease = false; };
|
||||||
constexpr SAdsrData(float attackGain, float autoReleaseDur, float attackDur, float decayDur, float sustainGain,
|
constexpr SAdsrData(float attackGain, float autoReleaseDur, float attackDur, float decayDur, float sustainGain,
|
||||||
float releaseDur, bool hasSustain, bool autoRelease) noexcept
|
float releaseDur, bool hasSustain, bool autoRelease) noexcept
|
||||||
: x0_attackGain(attackGain)
|
: x0_attackGain(attackGain)
|
||||||
|
|
2
amuse
2
amuse
|
@ -1 +1 @@
|
||||||
Subproject commit 757defee7a534acbafd73081127e170dc8fd3eb0
|
Subproject commit ae26ed2fdace7da1bd46bdc414c507b6f772a92d
|
2
nod
2
nod
|
@ -1 +1 @@
|
||||||
Subproject commit acdadaf963328348f64e5309c5e1380df90e1a67
|
Subproject commit ba0c2b78434843eac48e7c60b4d65ce7e2be11c1
|
Loading…
Reference in New Issue