diff --git a/Runtime/Graphics/CBooRenderer.cpp b/Runtime/Graphics/CBooRenderer.cpp index a0f9b4f14..4b23e81da 100644 --- a/Runtime/Graphics/CBooRenderer.cpp +++ b/Runtime/Graphics/CBooRenderer.cpp @@ -681,7 +681,16 @@ void CBooRenderer::LoadBallFade() { } CBooRenderer::CBooRenderer(IObjectStore& store, IFactory& resFac) -: x8_factory(resFac), xc_store(store), x2a8_thermalRand(20) { +: x8_factory(resFac), xc_store(store), x2a8_thermalRand(20) +, x318_24_refectionDirty(false) +, x318_25_drawWireframe(false) +, x318_26_requestRGBA6(false) +, x318_27_currentRGBA6(false) +, x318_28_disableFog(false) +, x318_29_thermalVisor(false) +, x318_30_inAreaDraw(false) +, x318_31_persistRGBA6(false) +, m_thermalHotPass(false) { g_Renderer = this; xee_24_ = true; diff --git a/Runtime/Graphics/CBooRenderer.hpp b/Runtime/Graphics/CBooRenderer.hpp index 7c3016297..81e4e47cb 100644 --- a/Runtime/Graphics/CBooRenderer.hpp +++ b/Runtime/Graphics/CBooRenderer.hpp @@ -152,20 +152,15 @@ class CBooRenderer final : public IRenderer { // std::unique_ptr x314_phazonSuitMask; CPhazonSuitFilter m_phazonSuitFilter; - union { - struct { - bool x318_24_refectionDirty : 1; - bool x318_25_drawWireframe : 1; - bool x318_26_requestRGBA6 : 1; - bool x318_27_currentRGBA6 : 1; - bool x318_28_disableFog : 1; - bool x318_29_thermalVisor : 1; - bool x318_30_inAreaDraw : 1; - bool x318_31_persistRGBA6 : 1; - bool m_thermalHotPass : 1; - }; - u16 dummy = 0; - }; + bool x318_24_refectionDirty : 1; + bool x318_25_drawWireframe : 1; + bool x318_26_requestRGBA6 : 1; + bool x318_27_currentRGBA6 : 1; + bool x318_28_disableFog : 1; + bool x318_29_thermalVisor : 1; + bool x318_30_inAreaDraw : 1; + bool x318_31_persistRGBA6 : 1; + bool m_thermalHotPass : 1; void GenerateFogVolumeRampTex(boo::IGraphicsDataFactory::Context& ctx); void GenerateSphereRampTex(boo::IGraphicsDataFactory::Context& ctx); diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp index f4af28744..6771971e0 100644 --- a/Runtime/Graphics/CMoviePlayer.cpp +++ b/Runtime/Graphics/CMoviePlayer.cpp @@ -140,10 +140,12 @@ u32 CMoviePlayer::THPAudioDecode(s16* buffer, const u8* audioFrame, bool stereo) } CMoviePlayer::CMoviePlayer(const char* path, float preLoadSeconds, bool loop, bool deinterlace) -: CDvdFile(path), xec_preLoadSeconds(preLoadSeconds) { - xf4_24_loop = loop; - m_deinterlace = deinterlace; - +: CDvdFile(path) +, xec_preLoadSeconds(preLoadSeconds) +, xf4_24_loop(loop) +, xf4_25_hasAudio(false) +, xf4_26_fieldFlip(false) +, m_deinterlace(deinterlace) { /* Read THP header information */ u8 buf[64]; SyncRead(buf, 64); diff --git a/Runtime/Graphics/CMoviePlayer.hpp b/Runtime/Graphics/CMoviePlayer.hpp index f32d47fe1..7d74267cf 100644 --- a/Runtime/Graphics/CMoviePlayer.hpp +++ b/Runtime/Graphics/CMoviePlayer.hpp @@ -99,21 +99,15 @@ private: float xe8_curSeconds = 0.f; float xec_preLoadSeconds; u32 xf0_preLoadFrames = 0; + bool xf4_24_loop : 1; + bool xf4_25_hasAudio : 1; + bool xf4_26_fieldFlip : 1; + bool m_deinterlace : 1; u32 xf8_ = 0; u32 xfc_fieldIndex = 0; std::unique_ptr m_yuvBuf; - union { - u32 m_dummy = 0; - struct { - bool xf4_24_loop : 1; - bool xf4_25_hasAudio : 1; - bool xf4_26_fieldFlip : 1; - bool m_deinterlace : 1; - }; - }; - specter::View::ViewBlock m_viewVertBlock; boo::ObjToken m_blockBuf; boo::ObjToken m_vertBuf;