isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply more review comments

Browse Source
This commit is contained in:
jonschz 2024-07-16 21:33:18 +02:00
parent 6dfd5cd537
commit 1a210d0647
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/legoracers.h
View File

@ -16,10 +16,10 @@ struct EdgeReference {
// SIZE 0x10 // SIZE 0x10
struct SkeletonKickPhase { struct SkeletonKickPhase {
EdgeReference* m_edgeRef; EdgeReference* m_edgeRef; // 0x00
float m_lower; float m_lower; // 0x04
float m_upper; float m_upper; // 0x08
unsigned char m_userState; unsigned char m_userState; // 0x0c
}; };
// VTABLE: LEGO1 0x100d58a0 LegoRaceActor // VTABLE: LEGO1 0x100d58a0 LegoRaceActor
@ -53,7 +53,7 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name); return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name);
} }
void ParseAction(char*) override; // vtable+0x20 void ParseAction(char* p_extra) override; // vtable+0x20
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
MxU32 VTable0x6c( MxU32 VTable0x6c(
LegoPathBoundary* p_boundary, LegoPathBoundary* p_boundary,
@ -70,8 +70,8 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
MxResult VTable0x9c() override; // vtable+0x9c MxResult VTable0x9c() override; // vtable+0x9c
virtual void SetMaxLinearVelocity(float p_maxLinearVelocity); virtual void SetMaxLinearVelocity(float p_maxLinearVelocity);
virtual void FUN_10012ff0(float); virtual void FUN_10012ff0(float p_param);
virtual MxS32 HandleSkeletonKicks(float); virtual MxS32 HandleSkeletonKicks(float p_param1);
// SYNTHETIC: LEGO1 0x10014240 // SYNTHETIC: LEGO1 0x10014240
// LegoRaceCar::`scalar deleting destructor' // LegoRaceCar::`scalar deleting destructor'

2
LEGO1/lego/legoomni/include/raceskel.h
View File

@ -12,7 +12,7 @@ class RaceSkel : public LegoAnimActor {
public: public:
RaceSkel(); RaceSkel();
void GetCurrentAnimData(float*, float*); void GetCurrentAnimData(float* p_outCurAnimPosition, float* p_outCurAnimDuration);
private: private:
float m_animPosition; // 0x1c float m_animPosition; // 0x1c

6
tools/isledecomp/isledecomp/compare/core.py
View File

@ -291,12 +291,12 @@ def _add_match_in_array(
assert node.data_type.members is not None assert node.data_type.members is not None
for i, array_element in enumerate(node.data_type.members): for array_element in node.data_type.members:
orig_element_base_addr = orig_addr + array_element.offset orig_element_base_addr = orig_addr + array_element.offset
recomp_element_base_addr = recomp_addr + array_element.offset recomp_element_base_addr = recomp_addr + array_element.offset
if array_element_type.members is None: if array_element_type.members is None:
_add_match_in_array( _add_match_in_array(
f"{name}[{i}]", f"{name}{array_element.name}",
array_element_type.key, array_element_type.key,
orig_element_base_addr, orig_element_base_addr,
recomp_element_base_addr, recomp_element_base_addr,
@ -304,7 +304,7 @@ def _add_match_in_array(
else: else:
for member in array_element_type.members: for member in array_element_type.members:
_add_match_in_array( _add_match_in_array(
f"{name}[{i}].{member.name}", f"{name}{array_element.name}.{member.name}",
array_element_type.key, array_element_type.key,
orig_element_base_addr + member.offset, orig_element_base_addr + member.offset,
recomp_element_base_addr + member.offset, recomp_element_base_addr + member.offset,