PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-09 17:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate s32->int, u32->uint; fix dolphin/types.h

Browse Source
This commit is contained in:
Luke Street
2022-09-05 00:01:13 -04:00
parent 78022784ef
commit 7eb08b6ee8
73 changed files with 413 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/MetroidPrime/CPASAnimState.hpp
View File

@@ -47,8 +47,8 @@ public:
kPT_Enum = 4,
};
union UParmValue {
s32 m_int;
u32 m_uint;
int m_int;
uint m_uint;
f32 m_float;
bool m_bool;
};
@@ -77,7 +77,7 @@ private:
class CPASAnimInfo {
private:
u32 x0_id;
uint x0_id;
rstl::reserved_vector< CPASAnimParm::UParmValue, 8 > x4_parms;
};
@@ -86,7 +86,7 @@ private:
pas::EAnimationState x0_id;
rstl::vector< CPASParmInfo > x4_parms;
rstl::vector< CPASAnimInfo > x14_anims;
rstl::vector< s32 > x24_selectionCache;
rstl::vector< int > x24_selectionCache;
};
CHECK_SIZEOF(CPASAnimState, 0x34)