From 9b816d471bdf4b3d8b2014470cbda100e1026300 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sat, 14 Sep 2019 10:08:09 -0700 Subject: [PATCH] Compile fixes --- Runtime/Input/CRumbleVoice.hpp | 4 ++-- amuse | 2 +- nod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Runtime/Input/CRumbleVoice.hpp b/Runtime/Input/CRumbleVoice.hpp index 21f66e5ed..8be238e63 100644 --- a/Runtime/Input/CRumbleVoice.hpp +++ b/Runtime/Input/CRumbleVoice.hpp @@ -34,10 +34,10 @@ struct SAdsrData { bool x18_24_hasSustain : 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, float releaseDur, bool hasSustain, bool autoRelease) noexcept : x0_attackGain(attackGain) diff --git a/amuse b/amuse index 757defee7..ae26ed2fd 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 757defee7a534acbafd73081127e170dc8fd3eb0 +Subproject commit ae26ed2fdace7da1bd46bdc414c507b6f772a92d diff --git a/nod b/nod index acdadaf96..ba0c2b784 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit acdadaf963328348f64e5309c5e1380df90e1a67 +Subproject commit ba0c2b78434843eac48e7c60b4d65ce7e2be11c1