mirror of
https://github.com/zeldaret/st
synced 2026-08-15 20:59:59 -04:00
Misc Stuff 6 (#78)
* gcc fixes * document random things in UnkStruct_027e09b8_00 * match func_ov001_020ba670 and rabbit docs * match func_ov026_0211f394 * fix build issues * match func_ov026_0211e3e0 * match func_ov026_02102924 * move structs to header * document train rope thing * MapObject OK and ActorRef stuff * match more actor funcs * fix regressions * fix build issues * more regressions fixes * name keyt grab func * UnkSubStruct19 -> CellAnimObject (based on the only assert string) * fix build issues due to merge * Actor::mUnk_4C -> Actor::mState + related changes * create GetActorPtr template inline for Actor_c4 * ActorUnk_ov000_020a8bb0 -> Actor_Derived1 * actor: add comments about mUnk_50/52 and change type of mAngle
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
#pragma once
|
||||
|
||||
#include "Actor/Actor.hpp"
|
||||
#include "LinkList.hpp"
|
||||
#include "Unknown/Common.hpp"
|
||||
#include "Unknown/UnkStruct_ov000_0208f820.hpp"
|
||||
#include "math.hpp"
|
||||
#include "types.h"
|
||||
|
||||
class UnkStruct_027e0ce0_40;
|
||||
|
||||
class PlayerActorBase_5C {
|
||||
public:
|
||||
/* 00 */ unk32 mUnk_00;
|
||||
@@ -41,14 +44,14 @@ public:
|
||||
/* 30 */ u16 mAngle;
|
||||
/* 32 */ u8 mInvincibilityTimer;
|
||||
/* 33 */ u8 mInvincibilityIconTimer; // the blinking icon on top-screen
|
||||
/* 34 */ unk32 mUnk_34;
|
||||
/* 34 */ ActorRef mGrabActor;
|
||||
/* 38 */ UnkStruct_PlayerGet_64 mUnk_38;
|
||||
/* 44 */ unk32 mUnk_44;
|
||||
/* 48 */ unk32 mUnk_48;
|
||||
/* 4C */ unk32 mUnk_4C;
|
||||
/* 50 */ unk32 mUnk_50;
|
||||
/* 50 */ ActorGrabParams mUnk_50;
|
||||
/* 54 */ unk32 mUnk_54;
|
||||
/* 58 */ unk32 mUnk_58;
|
||||
/* 58 */ UnkStruct_027e0ce0_40 *mUnk_58;
|
||||
/* 5C */ PlayerActorBase_5C mUnk_5C;
|
||||
/* 70 */ PlayerActorBase_70 *mUnk_70;
|
||||
/* 74 */ PlayerActorBase_74 *mUnk_74;
|
||||
@@ -194,9 +197,9 @@ public:
|
||||
/* 0B9 */ unk8 mUnk_B9;
|
||||
/* 0BA */ unk8 mUnk_BA;
|
||||
/* 0BB */ unk8 mUnk_BB;
|
||||
/* 0BC */ UnkSubStruct19 mUnk_BC;
|
||||
/* 0BC */ CellAnimObject mUnk_BC;
|
||||
/* 134 */ PlayerActor_134 *mUnk_134;
|
||||
/* 138 */ UnkSubStruct19 mUnk_138; // sanctuary link icon animation
|
||||
/* 138 */ CellAnimObject mUnk_138; // sanctuary link icon animation
|
||||
/* 1B0 */ PlayerActor_1B0 mUnk_1B0[3];
|
||||
/* 1D4 */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user