encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

link d_a_obj_lv6elevta (#2754)

Browse Source 
* link d_a_obj_lv6elevta

* fix return

* use implicit construction
This commit is contained in:
roeming
2025-10-24 04:20:04 +03:00
committed by GitHub
parent 70eefa53c7
commit 6ef3f87f06
3 changed files with 295 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -2110,7 +2110,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6bemos"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6bemos"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6bemos2"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6bemos2"),
ActorRel(NonMatching, "d_a_obj_lv6egate"), ActorRel(NonMatching, "d_a_obj_lv6egate"),
ActorRel(NonMatching, "d_a_obj_lv6elevta"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6elevta"),
ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6swturn"), ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_obj_lv6swturn"),
ActorRel(NonMatching, "d_a_obj_lv7BsGate"), ActorRel(NonMatching, "d_a_obj_lv7BsGate"),
ActorRel(NonMatching, "d_a_obj_lv7PropellerY"), ActorRel(NonMatching, "d_a_obj_lv7PropellerY"),
include/d/actor/d_a_obj_lv6elevta.h
+33 -10
View File
@@ -1,7 +1,9 @@
#ifndef D_A_OBJ_LV6ELEVTA_H #ifndef D_A_OBJ_LV6ELEVTA_H
#define D_A_OBJ_LV6ELEVTA_H #define D_A_OBJ_LV6ELEVTA_H
#include "d/d_event_lib.h"
#include "f_op/f_op_actor_mng.h" #include "f_op/f_op_actor_mng.h"
#include "d/d_bg_s_movebg_actor.h"
/** /**
* @ingroup actors-objects * @ingroup actors-objects
@@ -11,24 +13,45 @@
* @details * @details
* *
*/ */
class daObjLv6ElevtA_c : public fopAc_ac_c { class daObjLv6ElevtA_c : public dBgS_MoveBgActor,
public request_of_phase_process_class,
public dEvLib_callback_c {
public: public:
/* 80C82D38 */ void create1st(); daObjLv6ElevtA_c() : dEvLib_callback_c(this) {}
virtual ~daObjLv6ElevtA_c() {};
/* 80C82D38 */ int create1st();
/* 80C82DC8 */ void setMtx(); /* 80C82DC8 */ void setMtx();
/* 80C82E38 */ void CreateHeap(); /* 80C82E38 */ int CreateHeap();
/* 80C82EA8 */ void Create(); /* 80C82EA8 */ int Create();
/* 80C83028 */ void eventStart(); /* 80C83028 */ bool eventStart();
/* 80C830BC */ void moveAngle(void*); /* 80C830BC */ void moveAngle(void*);
/* 80C8321C */ void Execute(Mtx**); /* 80C8321C */ int Execute(Mtx**);
/* 80C83538 */ void Draw(); /* 80C83538 */ int Draw();
/* 80C835DC */ void Delete(); /* 80C835DC */ int Delete();
/* 80C83764 */ ~daObjLv6ElevtA_c();
int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); };
int getSw2No() { return fopAcM_GetParamBit(this, 8, 8); };
int getEvent() { return fopAcM_GetParamBit(this, 0x10, 8); };
private: private:
/* 0x568 */ u8 field_0x568[0x628 - 0x568]; /* 0x5B8 */ Mtx mMtx1;
/* 0x5E8 */ Mtx mMtx2;
/* 0x618 */ J3DModel* mModel;
/* 0x61C */ int mAngle;
/* 0x620 */ int mMode;
/* 0x624 */ bool mIsMoving;
}; };
STATIC_ASSERT(sizeof(daObjLv6ElevtA_c) == 0x628); STATIC_ASSERT(sizeof(daObjLv6ElevtA_c) == 0x628);
#if DEBUG
class daObjLv6ElevtA_HIO_c : public mDoHIO_entry_c {
public:
daObjLv6ElevtA_HIO_c();
void genMessage(JORMContext*);
/* 0x6 */ s16 mRightAngleTurnFrameCount;
};
#endif
#endif /* D_A_OBJ_LV6ELEVTA_H */ #endif /* D_A_OBJ_LV6ELEVTA_H */
src/d/actor/d_a_obj_lv6elevta.cpp
+243 -244
View File
File diff suppressed because it is too large Load Diff