mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-27 15:42:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_midp almost matching (#2371)

Browse Source 
* d_a_npc_midp almost matching

* Pull request cleanup
This commit is contained in:
Carco_21
2025-04-03 17:28:05 -04:00
committed by GitHub
parent 46e3dbf3a6
commit 145af15aee
2 changed files with 397 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_midp.h
+26 -17
View File
@@ -14,13 +14,19 @@
class daNpc_midP_c : public daNpcT_c {
public:
typedef int (daNpc_midP_c::*cutFunc)(int);
typedef int (daNpc_midP_c::*actionFunc)(void*);
enum Type {
TYPE_0,
TYPE_1,
};
/* 80A70C6C */ ~daNpc_midP_c();
/* 80A70D90 */ int create();
/* 80A71074 */ int CreateHeap();
/* 80A714BC */ void Delete();
/* 80A714F0 */ void Execute();
/* 80A71510 */ void Draw();
/* 80A714BC */ int Delete();
/* 80A714F0 */ int Execute();
/* 80A71510 */ int Draw();
/* 80A715D4 */ static int createHeapCallBack(fopAc_ac_c*);
/* 80A715F4 */ static int ctrlJointCallBack(J3DJoint*, int);
/* 80A7164C */ u8 getType();
@@ -39,11 +45,11 @@ public:
/* 80A72064 */ void setCollision();
/* 80A7216C */ int drawDbgInfo();
/* 80A72174 */ void drawGhost();
/* 80A721E0 */ void selectAction();
/* 80A72228 */ void chkAction(int (daNpc_midP_c::*)(void*));
/* 80A72254 */ void setAction(int (daNpc_midP_c::*)(void*));
/* 80A722FC */ void wait(void*);
/* 80A72548 */ void talk(void*);
/* 80A721E0 */ int selectAction();
/* 80A72228 */ int chkAction(int (daNpc_midP_c::*)(void*));
/* 80A72254 */ int setAction(int (daNpc_midP_c::*)(void*));
/* 80A722FC */ int wait(void*);
/* 80A72548 */ int talk(void*);
/* 80A737D0 */ daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
@@ -72,7 +78,10 @@ private:
/* 0xE40 */ u8 field_0xE40[0xe44 - 0xe40];
/* 0xE44 */ dCcD_Cyl mCyl;
/* 0xF80 */ u8 mType;
/* 0xF81 */ u8 field_0xf81[0xfa0-0xf81];
/* 0xF81 */ u8 field_0xf81[0xf84-0xf81];
/* 0xF84 */ actionFunc field_0xf84;
/* 0xF90 */ actionFunc field_0xf90;
/* 0xF9C */ int field_0xf9c;
};
STATIC_ASSERT(sizeof(daNpc_midP_c) == 0xfa0);
@@ -83,13 +92,13 @@ public:
struct Data {
/* 0x00 */ f32 field_0x00;
/* 0x04 */ f32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x04 */ f32 mGravity;
/* 0x08 */ f32 mScale;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ f32 field_0x14;
/* 0x18 */ f32 field_0x18;
/* 0x1C */ f32 field_0x1c;
/* 0x10 */ f32 mWeight;
/* 0x14 */ f32 mCylH;
/* 0x18 */ f32 mWallH;
/* 0x1C */ f32 mWallR;
/* 0x20 */ f32 field_0x20;
/* 0x24 */ f32 field_0x24;
/* 0x28 */ f32 field_0x28;
@@ -99,12 +108,12 @@ public:
/* 0x38 */ f32 field_0x38;
/* 0x3C */ f32 field_0x3c;
/* 0x40 */ f32 field_0x40;
/* 0x44 */ f32 field_0x44;
/* 0x44 */ f32 mMorfFrames;
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ s16 field_0x4e;
/* 0x50 */ f32 field_0x50;
/* 0x50 */ f32 mAttnFovY;
/* 0x54 */ f32 field_0x54;
/* 0x58 */ f32 field_0x58;
/* 0x5C */ f32 field_0x5c;
src/d/actor/d_a_npc_midp.cpp
+371 -655
View File
File diff suppressed because it is too large Load Diff