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

CHUDMemoParms fix

Browse Source
This commit is contained in:
Jack Andersen
2018-01-01 00:15:26 -10:00
parent b5c79d0e75
commit fac324f08f
4 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Runtime/MP1/CSamusHud.hpp
View File

@@ -14,6 +14,7 @@
#include "GuiSys/CHudThreatInterface.hpp"
#include "GuiSys/CHudVisorBeamMenu.hpp"
#include "Graphics/Shaders/CRandomStaticFilter.hpp"
#include "World/CHUDMemoParms.hpp"
namespace urde
{
@@ -21,23 +22,6 @@ class CGuiFrame;
class CStateManager;
class CGuiLight;
struct CHUDMemoParms
{
float x0_alpha = 0.f;
bool x4_initializeMemo = false;
bool x5_hintDismissSound = false;
bool x6_hintMemo = false;
CHUDMemoParms() = default;
CHUDMemoParms(float alpha, bool initializeMemo, bool hintDismissSound, bool hintMemo)
: x0_alpha(alpha), x4_initializeMemo(initializeMemo),
x5_hintDismissSound(hintDismissSound), x6_hintMemo(hintMemo) {}
CHUDMemoParms(CInputStream& in)
{
x0_alpha = in.readFloatBig();
x4_initializeMemo = in.readBool();
}
};
enum class EHudState
{
Combat,
@@ -182,7 +166,7 @@ class CSamusHud
CHUDMemoParms x548_hudMemoParms;
TLockedToken<CStringTable> x550_hudMemoString;
u32 x554_hudMemoIdx = 0;
float x558_messageTextAlpha = 0.f;
float x558_messageTextTime = 0.f;
float x55c_lastSfxChars = 0.f;
float x560_messageTextScale = 0.f;
CSfxHandle x564_freeLookSfx;