PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-13 16:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace int types in Retro code

Browse Source 
Retro seemingly avoided using the Dolphin
typedefs in most places, opting to use int/uint
instead. This likely means they didn't use
u8/s8/u16/s16/etc either.


Former-commit-id: 133326ae40
This commit is contained in:
Luke Street
2022-10-09 01:37:23 -04:00
parent f0ea5144ea
commit 7ca3a1c0bb
172 changed files with 1525 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/MetroidPrime/CInGameTweakManager.hpp
View File

@@ -10,24 +10,24 @@ class CTweakValue {
public:
struct Audio {
public:
Audio(f32 fadeIn, f32 fadeOut, f32 vol, const rstl::string& fileName, u32 handle)
Audio(float fadeIn, float fadeOut, float vol, const rstl::string& fileName, uint handle)
: x0_fadeIn(fadeIn)
, x4_fadeOut(fadeOut)
, x8_volume(vol)
, xc_fileName(fileName)
, x1c_res(handle) {}
f32 GetFadeIn() const { return x0_fadeIn; }
f32 GetFadeOut() const { return x4_fadeOut; }
f32 GetVolume() const { return x8_volume; }
float GetFadeIn() const { return x0_fadeIn; }
float GetFadeOut() const { return x4_fadeOut; }
float GetVolume() const { return x8_volume; }
const rstl::string& GetFileName() const { return xc_fileName; }
CAssetId GetResId() const { return x1c_res; }
// static Audio None() { return Audio(0.f, 0.f, 0.f, "", 0); }
private:
f32 x0_fadeIn;
f32 x4_fadeOut;
f32 x8_volume;
float x0_fadeIn;
float x4_fadeOut;
float x8_volume;
rstl::string xc_fileName;
CAssetId x1c_res;
};
@@ -49,8 +49,8 @@ private:
rstl::string x14_str;
Audio x24_audio;
union {
u32 x44_int;
f32 x44_flt;
uint x44_int;
float x44_flt;
};
};