Skip to content

map_obj: update BlockMgr and ActorBlockBase with s2e symbols #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Domthewiz wants to merge 1 commit into from
Closed

map_obj: update BlockMgr and ActorBlockBase with s2e symbols #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 5 additions & 25 deletions map_obj/ActorBlockBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,14 @@ class ActorBlockBase : public ChangeBlockCoinBase
/**
* @brief Persistent state of the block across area reloads.
*/
enum ActiveState
enum ObjBlockInfo
{
cActiveState_Active = 0,
cActiveState_Used = 1,
cActiveState_Destroyed = 2,
cActiveState_MultiCoinExpired = 3
cObjBlockInfo_Active = 0,
cObjBlockInfo_Used = 1,
cObjBlockInfo_Destroyed = 2,
cObjBlockInfo_MultiCoinExpired = 3
};

struct DestroyedParam
{
sead::Vector2f position;
u8 destroy_direction;
u8 state_type;
u8 _a;
s8 player_no;
u16 fragment_idx;
};
static_assert(sizeof(DestroyedParam) == 0x10, "DestroyedParam size mismatch");

struct DestroyedParam2
{
sead::Vector2f position;
u8 destroy_direction;
s8 player_no;
u16 fragment_idx;
};
static_assert(sizeof(DestroyedParam2) == 0xC, "DestroyedParam2 size mismatch");

public:
ActorBlockBase(const ActorCreateParam& param);
~ActorBlockBase() override { }
Expand Down
Loading