2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 12:27:43 +00:00

synchronize macOS with latest changes

This commit is contained in:
Jack Andersen
2018-05-26 11:30:19 -10:00
parent f2dda765af
commit 92ed463051
5 changed files with 9 additions and 7 deletions

View File

@@ -27,14 +27,14 @@ protected:
std::string x8_name;
EPOIType x18_type;
CCharAnimTime x1c_time;
u32 x24_index;
s32 x24_index;
bool x28_;
float x2c_weight;
s32 x30_charIdx = -1;
s32 x34_flags;
public:
CPOINode(std::string_view name, EPOIType type, const CCharAnimTime& time,
u32 index, bool, float weight, s32 charIdx, s32 flags);
s32 index, bool, float weight, s32 charIdx, s32 flags);
CPOINode(CInputStream& in);
virtual ~CPOINode() = default;
@@ -42,7 +42,7 @@ public:
const CCharAnimTime& GetTime() const { return x1c_time; }
void SetTime(const CCharAnimTime& time) { x1c_time = time; }
EPOIType GetPoiType() const { return x18_type; }
u32 GetIndex() const { return x24_index; }
s32 GetIndex() const { return x24_index; }
float GetWeight() const { return x2c_weight; }
s32 GetCharacterIndex() const { return x30_charIdx; }
s32 GetFlags() const { return x34_flags; }