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

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-01-28 22:28:35 -10:00
parent 4dd40f519e
commit ad2681f857
178 changed files with 303 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/MP1/CInGameGuiManager.hpp
View File

@@ -78,7 +78,7 @@ private:
SOnScreenTex x1c4_onScreenTex;
float x1d8_onScreenTexAlpha = 0.f;
TLockedToken<CTexture> x1dc_onScreenTexTok; // Used to be heap-allocated
std::experimental::optional<CTexturedQuadFilterAlpha> m_onScreenQuad;
rstl::optional<CTexturedQuadFilterAlpha> m_onScreenQuad;
EHelmetVisMode x1e0_helmetVisMode;
bool x1e4_enableTargetingManager;
bool x1e8_enableAutoMapper;
@@ -86,8 +86,8 @@ private:
u32 x1f0_enablePlayerVisor;
float x1f4_visorStaticAlpha;
std::experimental::optional<CTexturedQuadFilter> m_deathRenderTexQuad;
std::experimental::optional<CTexturedQuadFilter> m_deathDotQuad;
rstl::optional<CTexturedQuadFilter> m_deathRenderTexQuad;
rstl::optional<CTexturedQuadFilter> m_deathDotQuad;
CRandomStaticFilter m_randomStatic = {EFilterType::Blend};
CColoredQuadFilter m_deathWhiteout = {EFilterType::Blend};
CColoredQuadFilter m_deathBlackout = {EFilterType::Blend};