Fix dPnt struct (#2361)

* Fix dPnt struct

* Fix Vec warning
This commit is contained in:
LagoLunatic
2025-03-30 18:45:59 -04:00
committed by GitHub
parent ed42b15988
commit 559d389e3d
38 changed files with 82 additions and 80 deletions
+1 -3
View File
@@ -21,8 +21,6 @@ struct daNpc_GetParam2 { // name unknown
/* 0x8 */ int arcIdx;
};
struct dPnt : public dStage_dPnt_c {};
class daNpcT_ActorMngr_c {
private:
/* 0x0 */ fpc_ProcID mActorID;
@@ -1165,7 +1163,7 @@ private:
/* 0x02 */ u16 field_0x02;
/* 0x04 */ bool mIsReversed;
/* 0x05 */ bool mIsClosed;
/* 0x08 */ dStage_dPnt_c mPoints[96];
/* 0x08 */ dPnt mPoints[96];
public:
/* 80150870 */ void initialize(dPath*, int);
+11 -3
View File
@@ -2,10 +2,18 @@
#define D_D_PATH_H
#include "dolphin/types.h"
#include "mtx.h"
class cBgS_PolyInfo;
struct cXyz;
struct dStage_dPnt_c;
struct dPnt {
/* 0x0 */ u8 mArg1;
/* 0x1 */ u8 field_0x1;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 mArg0;
/* 0x4 */ Vec m_position;
}; // Size: 0x10
struct dPath {
/* 0x0 */ u16 m_num;
@@ -14,14 +22,14 @@ struct dPath {
/* 0x5 */ bool m_closed;
/* 0x6 */ u8 field_0x6;
/* 0x7 */ u8 field_0x7;
/* 0x8 */ dStage_dPnt_c* m_points;
/* 0x8 */ dPnt* m_points;
};
inline BOOL dPath_ChkClose(dPath* i_path) { return i_path->m_closed & 1; }
dPath* dPath_GetRoomPath(int path_index, int room_no);
dPath* dPath_GetNextRoomPath(dPath const* i_path, int room_no);
dStage_dPnt_c* dPath_GetPnt(dPath const* i_path, int pnt_index);
dPnt* dPath_GetPnt(dPath const* i_path, int pnt_index);
u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2);
#endif /* D_D_PATH_H */
+3 -6
View File
@@ -289,12 +289,9 @@ public:
// PPNT
struct dStage_dPnt_c {
/* 0x0 */ u8 mArg1;
/* 0x1 */ u8 field_0x1;
/* 0x2 */ u8 field_0x2;
/* 0x3 */ u8 mArg0;
/* 0x4 */ Vec m_position;
}; // Size: 0x10
/* 0x0 */ int num;
/* 0x4 */ u32 m_pnt_offset;
}; // Size: 0x8
struct dStage_FloorInfo_c {
// FLOR
+1 -1
View File
@@ -7,7 +7,7 @@
extern "C" {
#endif
typedef struct {
typedef struct Vec {
f32 x, y, z;
} Vec, *VecPtr, Point3d, *Point3dPtr;