From cc2ffc9f429292d69fe5178ecc29f5e7829bd1c3 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Sun, 19 Jan 2025 13:05:07 -0800 Subject: [PATCH] Fix CActorParameters, const memes --- src/Dolphin/os/OSReboot.c | 3 ++- src/Kyoto/Graphics/CCubeMaterial.cpp | 3 ++- src/MetroidPrime/CActorParameters.cpp | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Dolphin/os/OSReboot.c b/src/Dolphin/os/OSReboot.c index 77fb8f04..78e58c5a 100644 --- a/src/Dolphin/os/OSReboot.c +++ b/src/Dolphin/os/OSReboot.c @@ -3,6 +3,7 @@ #include "dolphin/os/OSBootInfo.h" #include "dolphin/os/OSContext.h" #include "dolphin/os/OSInterrupt.h" +#include "dolphin/types.h" typedef struct ApploaderHeader { // total size: 0x20 @@ -24,7 +25,7 @@ struct { void* argsAddr; // offset 0x18, size 0x4 } __OSRebootParams; // size: 0x1C, address: 0x0 -static ApploaderHeader Header; +static ApploaderHeader Header ATTRIBUTE_ALIGN(32); extern void* __OSSavedRegionStart; extern void* __OSSavedRegionEnd; diff --git a/src/Kyoto/Graphics/CCubeMaterial.cpp b/src/Kyoto/Graphics/CCubeMaterial.cpp index 55196dd9..2cbb39b8 100644 --- a/src/Kyoto/Graphics/CCubeMaterial.cpp +++ b/src/Kyoto/Graphics/CCubeMaterial.cpp @@ -2,6 +2,7 @@ #include "Kyoto/Graphics/CGX.hpp" #include "Kyoto/Graphics/CGraphics.hpp" +#include "Kyoto/Graphics/CModelFlags.hpp" #include "Kyoto/Math/CMath.hpp" #include @@ -66,7 +67,7 @@ static CTransform4f sTextureProjectionTransform = CTransform4f::Identity(); void CCubeMaterial::SetupBlendMode(uint blendFactors, const CModelFlags& flags, bool alphaTest) { GXBlendFactor newSrcFactor = static_cast< GXBlendFactor >(blendFactors & 0xFFFF); GXBlendFactor newDstFactor = static_cast< GXBlendFactor >(blendFactors >> 0x10); - CModelFlags::ETrans blendMode = flags.GetTrans(); + CModelFlags::ETrans blendMode = static_cast(flags.GetTrans()); if (alphaTest) { CGX::SetAlphaCompare(GX_GEQUAL, 64, GX_AOP_OR, GX_NEVER, 0); newSrcFactor = GX_BL_ONE; diff --git a/src/MetroidPrime/CActorParameters.cpp b/src/MetroidPrime/CActorParameters.cpp index 188f24f2..1467dcdd 100644 --- a/src/MetroidPrime/CActorParameters.cpp +++ b/src/MetroidPrime/CActorParameters.cpp @@ -19,9 +19,9 @@ CActorParameters::CActorParameters(const CLightParameters& lightParms, const CScannableParameters& scanParms, const rstl::pair< CAssetId, CAssetId >& xrayAssets, const rstl::pair< CAssetId, CAssetId >& thermalAssets, - const CVisorParameters& visorParms, bool globalTimeProvider, - bool thermalHeat, bool renderUnsorted, bool noSortThermal, - float fadeInTime, float fadeOutTime, float thermalMag) + const CVisorParameters& visorParms, const bool globalTimeProvider, + const bool thermalHeat, const bool renderUnsorted, const bool noSortThermal, + const float fadeInTime, const float fadeOutTime, const float thermalMag) : x0_lighting(lightParms) , x40_scannable(scanParms) , x44_xrayAssets(xrayAssets)