Skip to content

daObjCBlk_c equivalent #2326

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

Merged
TakaRikka merged 1 commit into from
Mar 12, 2025
Merged

daObjCBlk_c equivalent #2326

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ def MatchingFor(*versions):
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_bubblePilar"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_catdoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cb"),
ActorRel(NonMatching, "d_a_obj_cblock"),
ActorRel(Equivalent, "d_a_obj_cblock"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_cdoor"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chandelier"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_chest"),
Expand Down
51 changes: 42 additions & 9 deletions include/d/actor/d_a_obj_cblock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
#ifndef D_A_OBJ_CBLOCK_H
#define D_A_OBJ_CBLOCK_H

#include "d/d_bg_s_movebg_actor.h"
#include "d/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"

class dPath;

/**
* @ingroup actors-objects
* @class daObjCBlk_c
Expand All @@ -11,32 +15,61 @@
* @details
*
*/
class daObjCBlk_c : public fopAc_ac_c {
class daObjCBlk_c : public dBgS_MoveBgActor {
public:
typedef void (daObjCBlk_c::*modeFunc)();

struct chain_s {
public:
/* 80BC5E58 */ ~chain_s();
/* 80BC5E94 */ chain_s();

J3DModel* model;
cXyz position;
};

/* 80BC5A0C */ void initBaseMtx();
/* 80BC5A48 */ void setBaseMtx();
/* 80BC5ABC */ void Create();
/* 80BC5CF8 */ void CreateHeap();
/* 80BC5E98 */ void create();
/* 80BC6260 */ void Execute(f32 (**)[3][4]);
/* 80BC5ABC */ int Create();
/* 80BC5CF8 */ int CreateHeap();
/* 80BC5E98 */ int create();
/* 80BC6260 */ int Execute(f32 (**)[3][4]);
/* 80BC6270 */ void initWait();
/* 80BC627C */ void modeWait();
/* 80BC6414 */ void initWalk();
/* 80BC6430 */ void modeWalk();
/* 80BC65CC */ void getChainBasePos(cXyz*);
/* 80BC6648 */ void setPower(f32);
/* 80BC66DC */ void checkWall();
/* 80BC6868 */ bool Draw();
/* 80BC6870 */ void Delete();
/* 80BC66DC */ BOOL checkWall();
/* 80BC6868 */ int Draw();
/* 80BC6870 */ int Delete();

u8 getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
u8 getSwNo() { return fopAcM_GetParamBit(this, 16, 8); }
u8 getPathID() { return fopAcM_GetParamBit(this, 24, 8); }

private:
/* 0x568 */ u8 field_0x568[0xca8 - 0x568];
/* 0x5A0 */ request_of_phase_process_class phase;
/* 0x5A8 */ J3DModel* model1;
/* 0x5AC */ J3DModel* model2;
/* 0x5B0 */ dCcD_Stts stts;
/* 0x5EC */ dCcD_Cyl cyl;
/* 0x728 */ dCcD_Cyl cyls[4];
/* 0xC18 */ chain_s* chains;
/* 0xC1C */ u8 field_0xc1c;
/* 0xC1D */ u8 field_0xc1d;
/* 0xC1E */ u8 field_0xc1e;
/* 0xC1F */ u8 field_0xc1f;
/* 0xC20 */ f32 power;
/* 0xC24 */ cXyz field_0xc24[7];
/* 0xC78 */ u8 field_0xc78[0xc9c - 0xc78];
/* 0xC9C */ dPath* roomPath;
/* 0xCA0 */ u8 swNo;
/* 0xCA1 */ u8 arg0;
/* 0xCA2 */ u8 field_0xca2;
/* 0xCA3 */ u8 field_0xca3;
/* 0xCA4 */ s16 walkTimer;
/* 0xCA6 */ s16 field_0xca6;
};

STATIC_ASSERT(sizeof(daObjCBlk_c) == 0xca8);
Expand Down
5 changes: 1 addition & 4 deletions src/d/actor/d_a_e_kg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
UNK_REL_DATA;
#include "f_op/f_op_actor_enemy.h"


//
// Declarations:
//
// NONMATCHING - weak function order

/* 806F7EEC-806F7F24 0000EC 0038+00 1/1 0/0 0/0 .text __ct__12daE_KG_HIO_cFv */
daE_KG_HIO_c::daE_KG_HIO_c() {
Expand Down
Loading