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

Miscellaneous TU fixes (#2662)

Browse Source
This commit is contained in:
Max Roncace
2025-09-15 02:53:53 -07:00
committed by GitHub
parent 9fd28c507f
commit a8136496c7
27 changed files with 381 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/GZ2E01/rels/d_a_npc_moi/symbols.txt
+1
View File
@@ -253,6 +253,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@3839 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@5529 = .bss:0x00000058; // type:object size:0xC scope:local
init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local
lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
config/GZ2E01/rels/d_a_npc_zrc/symbols.txt
+1
View File
@@ -268,6 +268,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4021 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4773 = .bss:0x00000058; // type:object size:0xC scope:local
init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
config/GZ2E01/rels/d_a_obj_movebox/symbols.txt
+4
View File
@@ -139,15 +139,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s
@3672 = .bss:0x00000840; // type:object size:0xC scope:local
M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float
@3909 = .bss:0x0000125C; // type:object size:0xC scope:local
init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local
touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local
@4501 = .bss:0x000012DC; // type:object size:0xC scope:local
init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local
scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local
@4574 = .bss:0x000012F8; // type:object size:0xC scope:local
init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local
@4577 = .bss:0x00001308; // type:object size:0xC scope:local
@4578 = .bss:0x00001314; // type:object size:0xC scope:local
@4579 = .bss:0x00001320; // type:object size:0xC scope:local
dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local
@4762 = .bss:0x0000135C; // type:object size:0xC scope:local
init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local
particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global
config/GZ2J01/rels/d_a_npc_moi/symbols.txt
+1
View File
@@ -252,6 +252,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@3839 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@5529 = .bss:0x00000058; // type:object size:0xC scope:local
init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local
lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
config/GZ2J01/rels/d_a_npc_zrc/symbols.txt
+1
View File
@@ -267,6 +267,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@4021 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
@4773 = .bss:0x00000058; // type:object size:0xC scope:local
init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local
eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global
config/GZ2J01/rels/d_a_obj_iceleaf/splits.txt
+1
View File
@@ -13,3 +13,4 @@ d/actor/d_a_obj_iceleaf.cpp:
.text start:0x00000078 end:0x000016BC
.rodata start:0x00000000 end:0x0000004C
.data start:0x00000000 end:0x000001E4
.bss start:0x00000000 end:0x00000004
config/GZ2J01/rels/d_a_obj_movebox/symbols.txt
+4
View File
@@ -138,15 +138,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s
@3672 = .bss:0x00000840; // type:object size:0xC scope:local
M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float
@3909 = .bss:0x0000125C; // type:object size:0xC scope:local
init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local
touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local
@4501 = .bss:0x000012DC; // type:object size:0xC scope:local
init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local
scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local
@4574 = .bss:0x000012F8; // type:object size:0xC scope:local
init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local
@4577 = .bss:0x00001308; // type:object size:0xC scope:local
@4578 = .bss:0x00001314; // type:object size:0xC scope:local
@4579 = .bss:0x00001320; // type:object size:0xC scope:local
dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local
@4762 = .bss:0x0000135C; // type:object size:0xC scope:local
init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local
particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local
sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global
sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global
configure.py
+12 -12
View File
@@ -1537,7 +1537,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_shutter"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_spiral"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_dshutter"),
ActorRel(NonMatching, "d_a_ep"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_ep"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_hitobj"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag00"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_kytag04"),
@@ -1545,8 +1545,8 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_brakeeff"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_burnbox"),
ActorRel(NonMatching, "d_a_obj_carry"),
ActorRel(NonMatching, "d_a_obj_ito"),
ActorRel(NonMatching, "d_a_obj_movebox"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ito"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_movebox"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_swpush"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_timer"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_path_line"),
@@ -1592,7 +1592,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_demo_item"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_door_bossL1"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dn"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_fm"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fm"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_ga"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hb"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_nest"),
@@ -1610,7 +1610,7 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_fish"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_henna"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kakashi"),
ActorRel(MatchingFor("GZ2E01"), "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kkri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_kolin"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_maro"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_taro"),
@@ -1713,9 +1713,9 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dd"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_df"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dk"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_dt"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_dt"),
ActorRel(NonMatching, "d_a_e_fb"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_fk"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fk"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fs"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_fz"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_gb"),
@@ -1728,7 +1728,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_e_hm"),
ActorRel(NonMatching, "d_a_e_hp"),
ActorRel(NonMatching, "d_a_e_hz"),
ActorRel(MatchingFor("GZ2E01"), "d_a_e_hzelda"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_hzelda"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_is"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kg"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_e_kk"),
@@ -1863,7 +1863,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_lud"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_midp"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_moi"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_npc_moi"),
ActorRel(NonMatching, "d_a_npc_moir", extra_cflags=[DANPCF_C_HACK]),
ActorRel(NonMatching, "d_a_npc_myna2"),
ActorRel(NonMatching, "d_a_npc_ne"),
@@ -1976,8 +1976,8 @@ config.libs = [
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_firepillar2"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_flag"),
ActorRel(Equivalent, "d_a_obj_flag2"), # weak function order
ActorRel(NonMatching, "d_a_obj_flag3"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_flag2"),
ActorRel(Equivalent, "d_a_obj_flag3"), # weak function order
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_food"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_fw"),
ActorRel(NonMatching, "d_a_obj_gadget"),
@@ -2158,7 +2158,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_spinLift"),
ActorRel(NonMatching, "d_a_obj_ss_drink"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_ss_item"),
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stairBlock"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stone"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_stopper"),
ActorRel(NonMatching, "d_a_obj_stopper2"),
include/JSystem/J3DGraphAnimator/J3DJoint.h
+1 -1
View File
@@ -69,7 +69,7 @@ public:
void setYounger(J3DJoint* pYounger) { mYounger = pYounger; }
void setCurrentMtxCalc(J3DMtxCalc* pMtxCalc) { mCurrentMtxCalc = pMtxCalc; }
J3DTransformInfo& getTransformInfo() { return mTransformInfo; }
void setTransformInfo(J3DTransformInfo& i_info) { mTransformInfo = i_info; }
void setTransformInfo(const J3DTransformInfo& i_info) { mTransformInfo = i_info; }
Vec* getMax() { return &mMax; }
Vec* getMin() { return &mMin; }
void setCallBack(J3DJointCallBack callback) { mCallBack = callback; }
include/d/actor/d_a_npc_kasi_mich.h
+1
View File
@@ -75,6 +75,7 @@ public:
/* 80A28F74 */ int escape(int);
/* 80A2908C */ int iyan_look(int);
/* 80A29164 */ int turn_hana(int);
void dummy();
/* 80A291E8 */ int wait_dummy(int);
/* 80A2926C */ int cheer(int);
/* 80A29458 */ BOOL _turn_to_link(s16);
include/d/actor/d_a_obj_flag2.h
-2
View File
@@ -25,7 +25,6 @@ public:
/* 80BEE0B8 */ cXyz getTargetPos() { return mPositions[4]; }
/* 80BECF30 */ void draw();
/* 80BED9C4 */ virtual ~FlagCloth_c() {}
cXyz* getPos() { return mPositions; }
cXyz* getNormal() { return mNormals; }
@@ -76,7 +75,6 @@ public:
/* 80BED44C */ void setCollision();
/* 80BED480 */ int createHeap();
/* 80BED6A0 */ int create();
/* 80BED7A4 */ daObjFlag2_c();
/* 80BEDCE0 */ int draw();
/* 80BEDEE0 */ ~daObjFlag2_c();
inline int execute();
include/d/actor/d_a_obj_flag3.h
+10 -10
View File
@@ -16,13 +16,20 @@ class FlagCloth2_c : public J3DPacket {
public:
/* 80BEEDE4 */ void execute();
/* 80BEEF74 */ inline void calcFlagNormal(cXyz*, int);
static void initCcSphere(fopAc_ac_c*);
/* 80BEF278 */ inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
/* 80BEF790 */ virtual ~FlagCloth2_c();
/* 80BEFD08 */ void initFlagPos(cXyz*, fopAc_ac_c*);
/* 80BF00A0 */ virtual void draw();
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
/* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
inline void calcFlagNormalBack();
void calcFlagNormalBack() {
cXyz* pNormal = getNormal();
cXyz* pNormalBack = getNormalBack();
for (int i = 0; i < 36; pNormal++, pNormalBack++, i++) {
pNormalBack->set(-pNormal->x, -pNormal->y, -pNormal->z);
}
}
cXyz* getPos() { return mPositions; }
cXyz* getVec() { return mVecs; }
cXyz* getNormal() { return mNormals; }
@@ -43,14 +50,7 @@ public:
}
}
void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
cXyz acStack_2c = *param_2 - *param_1;
param_4 = acStack_2c.abs() - param_4;
cXyz cStack_38 = acStack_2c.normZC();
param_4 *= mSpringRate;
cStack_38 *= param_4;
*param_3 += cStack_38;
}
void calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4);
/* 0x010 */ GXTexObj mTexObj;
/* 0x030 */ dKy_tevstr_c mTevStr;
include/d/actor/d_a_obj_ito.h
+1 -1
View File
@@ -15,7 +15,7 @@
struct ito_s {
/* 0x000 */ mDoExt_3DlineMat0_c mLineMat;
/* 0x01C */ f32 field_0x1c[120];
/* 0x01C */ f32 field_0x1c[6][20];
/* 0x1FC */ cXyz field_0x1fc[6];
/* 0x244 */ s16 field_0x244[6];
/* 0x250 */ f32 field_0x250;
include/d/d_a_obj.h
-2
View File
@@ -22,13 +22,11 @@ int PrmAbstract(const fopAc_ac_c* i_actor, T i_prmA, T i_prmB) {
return ((1 << i_prmA) - 1) & (param >> i_prmB);
}
#ifdef DEBUG
class HioVarious_c {
public:
static void init(JORReflexible*, const char*);
static void clean(JORReflexible*);
};
#endif
}; // namespace daObj
src/d/actor/d_a_ep.cpp
+13 -13
View File
@@ -5,10 +5,11 @@
#include "d/dolzel_rel.h"
#include "d/actor/d_a_ep.h"
#include "d/d_com_inf_game.h"
#include "m_Do/m_Do_lib.h"
#include "d/actor/d_a_player.h"
#include "d/d_a_obj.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "m_Do/m_Do_lib.h"
/* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text hahen_draw__FP8ep_class */
static void hahen_draw(ep_class* i_this) {
@@ -280,22 +281,21 @@ static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {
/* 804690F8-80469568 000F78 0470+00 1/1 0/0 0/0 .text hahen_move__FP8ep_class */
static void hahen_move(ep_class* i_this) {
// NONMATCHING - equivalent in debug....
fopAc_ac_c* a_this = i_this;
fopAc_ac_c* player = dComIfGp_getPlayer(0);
dBgS_LinChk dStack_cc;
ep_hahen_s* epHahenS;
daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
dBgS_LinChk dStack_cc;
if (!fopAcM_checkCarryNow(a_this)) {
f32 fVar1 = 50.0f;
s8 bVar2 = false;
cXyz local_d8;
for (int iters = 0; iters < 10; iters++) {
epHahenS = i_this->mHahen;
epHahenS = static_cast<ep_hahen_s*>(i_this->mHahen);
for (int j = 0; j < 6; j++, epHahenS++) {
local_d8 = player->current.pos - epHahenS->field_0x4;
if (local_d8.abs() < fVar1) {
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_ETC_e);
cLib_onBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
a_this->current.pos = epHahenS->field_0x4;
a_this->attention_info.position = a_this->eyePos = a_this->current.pos;
a_this->current.angle = a_this->shape_angle = epHahenS->field_0x28;
@@ -313,7 +313,7 @@ static void hahen_move(ep_class* i_this) {
fVar1 += 20.0f;
}
} else {
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_ETC_e);
cLib_offBit<u32>(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e);
i_this->mHahen[i_this->field_0xa78].field_0x97 = 3;
i_this->mHahen[i_this->field_0xa78].field_0x4 = a_this->current.pos;
i_this->mHahen[i_this->field_0xa78].field_0x28 = a_this->shape_angle;
@@ -325,7 +325,7 @@ static void hahen_move(ep_class* i_this) {
if (epHahenS->field_0x98) {
--epHahenS->field_0x98;
}
if (i_this->field_0xa79 == 3) {
if (epHahenS->field_0x97 == 1) {
hahen_normal(i_this, epHahenS);
@@ -819,10 +819,10 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
// NONMATCHING - equiv in debug
ep_class* i_this = (ep_class*)a_this;
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]);
void* modelData = dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]);
JUT_ASSERT(0x855, modelData != 0);
i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
i_this->mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
if (i_this->mpModel == NULL) {
return 0;
}
@@ -830,11 +830,11 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
MtxScale(0.0f, 0.0f, 0.0f, 0);
i_this->mpModel->setBaseTRMtx(*calc_mtx);
modelData = (J3DModelData*)dComIfG_getObjectRes("Ep", 7);
modelData = dComIfG_getObjectRes("Ep", 7);
JUT_ASSERT(0x884, modelData != 0);
for (int i = 0; i < 6; i++) {
i_this->mHahen[i].mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
i_this->mHahen[i].mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
if (i_this->mHahen[i].mpModel == NULL) {
return 0;
}
src/d/actor/d_a_npc_kasi_kyu.cpp
+1 -1
View File
@@ -1354,7 +1354,7 @@ int daNpcKasiKyu_c::cheer(int param_1) {
fopAcM_SetSpeedF(this, 0.0f);
mpMorf->setPlaySpeed(0.0f);
mTalked = false;
field_0x1460 = 20;
field_0x1460 = 12;
mMode = 1;
break;
src/d/actor/d_a_npc_kasi_mich.cpp
+14 -7
View File
@@ -977,7 +977,7 @@ int daNpcKasiMich_c::chace_st(int param_1) {
case 1:
if (_turn_to_link(0xC00)) {
setAction(&daNpcKasiMich_c::chace);
setAction(&daNpcKasiMich_c::wait);
}
break;
}
@@ -1010,7 +1010,7 @@ int daNpcKasiMich_c::chace(int param_1) {
setAction(&daNpcKasiMich_c::wait);
}
} else {
setAction(&daNpcKasiMich_c::chace_st);
setAction(&daNpcKasiMich_c::wait);
}
break;
}
@@ -1054,7 +1054,7 @@ int daNpcKasiMich_c::turn_link(int param_1) {
case 1:
if (_turn_to_link(0x1000)) {
setAction(&daNpcKasiMich_c::wait);
setAction(&daNpcKasiMich_c::chace);
break;
}
}
@@ -1082,7 +1082,7 @@ int daNpcKasiMich_c::turn_home(int param_1) {
shape_angle.y = current.angle.y;
if (bVar1) {
setAction(&daNpcKasiMich_c::wait_dummy);
setAction(&daNpcKasiMich_c::wait);
}
break;
}
@@ -1106,7 +1106,7 @@ int daNpcKasiMich_c::turn_center(int param_1) {
case 1:
if (_turn_pos(mCenterPos, 0x1000)) {
setAction(&daNpcKasiMich_c::wait_dummy);
setAction(&daNpcKasiMich_c::chace_st);
}
break;
}
@@ -1193,7 +1193,7 @@ int daNpcKasiMich_c::kya_stop(int param_1) {
case 0:
if (mMotion != MOT_MICH_KYA_TALK) {
setAction(&daNpcKasiMich_c::wait);
setAction(&daNpcKasiMich_c::chace);
} else {
mMode = 1;
}
@@ -1201,7 +1201,7 @@ int daNpcKasiMich_c::kya_stop(int param_1) {
case 1:
if (mpMorf->getFrame() == 19.0f || mpMorf->getFrame() == 1.0f) {
setAction(&daNpcKasiMich_c::wait_dummy);
setAction(&daNpcKasiMich_c::wait);
}
break;
}
@@ -1285,6 +1285,13 @@ int daNpcKasiMich_c::iyan_look(int param_1) {
return 1;
}
void daNpcKasiMich_c::dummy() {
setAction(&daNpcKasiMich_c::wait_dummy);
setAction(&daNpcKasiMich_c::wait);
setAction(&daNpcKasiMich_c::wait_dummy);
setAction(&daNpcKasiMich_c::wait_dummy);
}
/* 80A29164-80A291E8 003084 0084+00 1/0 0/0 0/0 .text turn_hana__15daNpcKasiMich_cFi */
int daNpcKasiMich_c::turn_hana(int param_1) {
switch (mMode) {
src/d/actor/d_a_npc_moi.cpp
+89 -63
View File
@@ -154,6 +154,32 @@ daNpc_Moi_c::cutFunc daNpc_Moi_c::mCutList[5] = {
&daNpc_Moi_c::cutFindWolf,
};
enum Motion {
/* 0x00 */ MOT_UNK_0 = 0,
/* 0x01 */ MOT_UNK_1 = 1,
/* 0x02 */ MOT_UNK_2 = 2,
/* 0x03 */ MOT_UNK_3 = 3,
/* 0x04 */ MOT_UNK_4 = 4,
/* 0x05 */ MOT_UNK_5 = 5,
/* 0x08 */ MOT_UNK_8 = 8,
/* 0x09 */ MOT_UNK_9 = 9,
/* 0x0A */ MOT_UNK_10 = 10,
/* 0x0B */ MOT_UNK_11 = 11,
/* 0x0E */ MOT_UNK_14 = 14,
/* 0x0F */ MOT_UNK_15 = 15,
/* 0x10 */ MOT_UNK_16 = 16,
/* 0x12 */ MOT_UNK_18 = 18,
/* 0x13 */ MOT_UNK_19 = 19,
/* 0x15 */ MOT_UNK_21 = 21,
/* 0x25 */ MOT_UNK_37 = 37,
/* 0x26 */ MOT_UNK_38 = 38,
/* 0x27 */ MOT_UNK_39 = 39,
/* 0x28 */ MOT_UNK_40 = 40,
/* 0x2B */ MOT_UNK_43 = 43,
/* 0x2D */ MOT_UNK_45 = 45,
/* 0x2F */ MOT_UNK_47 = 47,
};
/* 80A73F4C-80A74150 0000EC 0204+00 1/0 0/0 0/0 .text __dt__11daNpc_Moi_cFv */
daNpc_Moi_c::~daNpc_Moi_c() {
if (mpMorf[0] != 0) {
@@ -706,22 +732,22 @@ BOOL daNpc_Moi_c::checkChangeEvt() {
void daNpc_Moi_c::setAfterTalkMotion() {
int iVar2 = 21;
switch (mFaceMotionSeqMngr.getNo()) {
case 1:
iVar2 = 18;
case MOT_UNK_1:
iVar2 = MOT_UNK_18;
break;
case 2:
iVar2 = 19;
case MOT_UNK_2:
iVar2 = MOT_UNK_19;
break;
case 3:
iVar2 = 16;
case MOT_UNK_3:
iVar2 = MOT_UNK_16;
break;
case 4:
iVar2 = 14;
case MOT_UNK_4:
iVar2 = MOT_UNK_14;
break;
case 5:
iVar2 = 15;
case MOT_UNK_5:
iVar2 = MOT_UNK_15;
break;
case 9:
case MOT_UNK_9:
return;
}
mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
@@ -1108,7 +1134,7 @@ BOOL daNpc_Moi_c::chkPlayerGetWoodShield() {
/* 80A766DC-80A76888 00287C 01AC+00 2/2 0/0 0/0 .text setSSlash__11daNpc_Moi_cFi */
void daNpc_Moi_c::setSSlash(int param_1) {
mMotionSeqMngr.setNo(43, 0.0f, 1, 0);
mMotionSeqMngr.setNo(MOT_UNK_43, 0.0f, 1, 0);
/* dSv_event_tmp_flag_c::GUARD_URI - Ordon Village - Rusl is guarding Uli, Ordon village night */
if (dComIfGs_isTmpBit(0x1308)) {
mSound.startCreatureVoice(JAISoundID(Z2SE_MOI_V_GUARD_SWING), -1);
@@ -1212,7 +1238,7 @@ int daNpc_Moi_c::injuryCheck() {
BOOL bVar1 = TRUE;
int timer = field_0x1658;
if (mMotionSeqMngr.getNo() == 37 || mMotionSeqMngr.getNo() == 38) {
if (mMotionSeqMngr.getNo() == MOT_UNK_37 || mMotionSeqMngr.getNo() == MOT_UNK_38) {
if (mMotionSeqMngr.checkEndSequence()) {
cLib_calcTimer(&timer);
} else {
@@ -1223,23 +1249,23 @@ int daNpc_Moi_c::injuryCheck() {
if (bVar1 && timer != 0) {
if (field_0x1667 != 0) {
if (timer & 1 != 0) {
mMotionSeqMngr.setNo(38, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_38, -1.0f, 0, 0);
} else {
mMotionSeqMngr.setNo(37, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_37, -1.0f, 0, 0);
}
} else {
f32 fVar3 = cM_rnd();
fVar3 -= 0.5f;
if (mMotionSeqMngr.getNo() == 38) {
if (mMotionSeqMngr.getNo() == MOT_UNK_38) {
fVar3 += 0.25f;
}
if (mMotionSeqMngr.getNo() == 37) {
if (mMotionSeqMngr.getNo() == MOT_UNK_37) {
fVar3 -= 0.25f;
}
if (0.0f < fVar3) {
mMotionSeqMngr.setNo(38, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_38, -1.0f, 0, 0);
} else {
mMotionSeqMngr.setNo(37, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_37, -1.0f, 0, 0);
}
}
}
@@ -1257,7 +1283,7 @@ int daNpc_Moi_c::injuryTurn(cXyz param_1) {
if (abs(iVar1) < 0x2000) {
bVar1 = TRUE;
} else {
mMotionSeqMngr.setNo(40, 4.0f, 1, 0);
mMotionSeqMngr.setNo(MOT_UNK_40, 4.0f, 1, 0);
field_0x1664 = mCurAngle.y + 0x4000;
mTurnAmount = 0;
mStartAngle = current.angle.y;
@@ -1330,22 +1356,22 @@ int daNpc_Moi_c::poise() {
if (field_0x1669 != 0) {
if (field_0x166c != 0) {
if (field_0x1664 == mCurAngle.y) {
if (mMotionSeqMngr.getNo() == 43) {
if (mMotionSeqMngr.getNo() == MOT_UNK_43) {
if (mMotionSeqMngr.checkEndSequence()) {
mMotionSeqMngr.setNo(10, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_10, -1.0f, 0, 0);
field_0x166c = 0;
}
} else if (mMotionSeqMngr.getNo() == 10) {
mMotionSeqMngr.setNo(10, -1.0f, 0, 0);
} else if (mMotionSeqMngr.getNo() == MOT_UNK_10) {
mMotionSeqMngr.setNo(MOT_UNK_10, -1.0f, 0, 0);
field_0x166c = 0;
}
} else {
step(field_0x1664, -1, -1, 10, 0);
}
} else {
if (mMotionSeqMngr.getNo() == 43) {
if (mMotionSeqMngr.getNo() == MOT_UNK_43) {
if (mMotionSeqMngr.checkEndSequence()) {
mMotionSeqMngr.setNo(10, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_10, -1.0f, 0, 0);
field_0x166c = 0;
}
} else {
@@ -1355,7 +1381,7 @@ int daNpc_Moi_c::poise() {
setSSlash(0);
} else if (field_0x166e) {
if (step(field_0x1664, -1, -1, 10, 0)) {
mMotionSeqMngr.setNo(10, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_10, -1.0f, 0, 0);
field_0x166e = 0;
}
} else if ((s16)abs((s16)(fopAcM_searchPlayerAngleY(this) - mCurAngle.y)) <
@@ -1371,7 +1397,7 @@ int daNpc_Moi_c::poise() {
if (field_0x1648 == 0) {
field_0x1648 = cLib_getRndValue(iVar13 * 0.5f, iVar13 * 1.5f);
} else if (!cLib_calcTimer(&field_0x1648)) {
mMotionSeqMngr.setNo(43, 0.0f, 1, 0);
mMotionSeqMngr.setNo(MOT_UNK_43, 0.0f, 1, 0);
/* dSv_event_tmp_flag_c::GUARD_URI - Ordon Village - Rusl is guarding Uli, Ordon village night */
if (dComIfGs_isTmpBit(0x1308)) {
mSound.startCreatureVoice(JAISoundID(Z2SE_MOI_V_GUARD_SWING), -1);
@@ -1385,9 +1411,9 @@ int daNpc_Moi_c::poise() {
} else {
field_0x1664 = fopAcM_searchPlayerAngleY(this);
if (field_0x166b != 0) {
mMotionSeqMngr.setNo(10, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_10, -1.0f, 0, 0);
} else {
mMotionSeqMngr.setNo(11, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_11, -1.0f, 0, 0);
}
field_0x1648 = 0;
field_0x166e = 1;
@@ -1435,26 +1461,26 @@ int daNpc_Moi_c::cutDeliveredSw(int param_1) {
if (dComIfGp_getEventManager().getIsAddvance(param_1)) {
switch (iVar6) {
case 0:
mFaceMotionSeqMngr.setNo(21, 0.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, 0.0f, 0, 0);
mMotionSeqMngr.setNo(45, 0.0f, 1, 0);
mEventTimer = uVar5;
break;
case 1:
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(45, -1.0f, 0, 0);
mEventTimer = uVar5;
break;
case 2:
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_0, -1.0f, 0, 0);
mEventTimer = uVar5;
break;
case 3:
initTalk(mFlowNodeNo, NULL);
break;
case 4:
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_0, -1.0f, 0, 0);
}
}
@@ -1542,8 +1568,8 @@ int daNpc_Moi_c::cutAppearanceMoi(int param_1) {
setAngle(home.angle.y);
break;
case 2:
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(45, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_45, -1.0f, 0, 0);
dComIfGp_getEvent().setPt2(this);
mEventTimer = local_78;
break;
@@ -1555,8 +1581,8 @@ int daNpc_Moi_c::cutAppearanceMoi(int param_1) {
setPos(cStack_30);
break;
case 4:
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_0, -1.0f, 0, 0);
initTalk(120, &local_68[0]);
break;
case 6:
@@ -1686,13 +1712,13 @@ int daNpc_Moi_c::cutFindWolf(int param_1) {
if (dComIfGp_getEventManager().getIsAddvance(param_1)) {
switch (iVar9) {
case 0:
mMotionSeqMngr.setNo(10, 0.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_10, 0.0f, 0, 0);
speedF = 0.0f;
speed.setall(0.0f);
break;
case 1:
mFaceMotionSeqMngr.setNo(8, 0.0f, 0, 0);
mMotionSeqMngr.setNo(16, 0.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_8, 0.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_16, 0.0f, 0, 0);
mSound.startCreatureVoice(JAISoundID(Z2SE_MOI_V_KUTT), -1);
field_0x166b = 1;
cStack_30 = mPath.getPntPos(0);
@@ -1749,8 +1775,8 @@ int daNpc_Moi_c::wait(void* param_1) {
case MODE_ENTER:
case MODE_INIT:
if (!mStagger.checkStagger()) {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_0, -1.0f, 0, 0);
field_0x1648 = cLib_getRndValue(iVar4 * 0.5f, iVar4 * 1.5f);
mMode = MODE_RUN;
}
@@ -1783,8 +1809,8 @@ int daNpc_Moi_c::wait(void* param_1) {
if (mType == 1) {
if (field_0x1648) {
if (!cLib_calcTimer(&field_0x1648)) {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(47, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_47, -1.0f, 0, 0);
}
} else {
if (mMotionSeqMngr.checkEndSequence() || srchPlayerActor()) {
@@ -1822,8 +1848,8 @@ int daNpc_Moi_c::walk(void* param_1) {
case MODE_ENTER:
case MODE_INIT:
if (!mStagger.checkStagger()) {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(45, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_45, -1.0f, 0, 0);
mMode = MODE_RUN;
}
case MODE_RUN:
@@ -1864,17 +1890,17 @@ int daNpc_Moi_c::walkOnEggshell(void* param_1) {
case MODE_INIT:
if (!mStagger.checkStagger()) {
if (field_0x1669) {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
int motion_no;
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
Motion motion_no;
if (field_0x166b) {
motion_no = 10;
motion_no = MOT_UNK_10;
} else {
motion_no = 11;
motion_no = MOT_UNK_11;
}
mMotionSeqMngr.setNo(motion_no, -1.0f, 0, 0);
} else {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(40, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_40, -1.0f, 0, 0);
mJntAnm.lookNone(0);
field_0x164c = cLib_getRndValue(sVar1 * 0.5f, sVar1 * 1.5f);
}
@@ -1916,11 +1942,11 @@ int daNpc_Moi_c::walkOnEggshell(void* param_1) {
poise();
} else {
if (field_0x1669) {
mMotionSeqMngr.setNo(39, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_39, -1.0f, 0, 0);
field_0x1669 = 0;
field_0x165c = 0;
} else {
if (mMotionSeqMngr.getNo() == 39) {
if (mMotionSeqMngr.getNo() == MOT_UNK_39) {
if (mMotionSeqMngr.checkEndSequence()) {
mMode = MODE_INIT;
}
@@ -1948,8 +1974,8 @@ int daNpc_Moi_c::rest(void* param_1) {
case MODE_ENTER:
case MODE_INIT:
if (!mStagger.checkStagger()) {
mFaceMotionSeqMngr.setNo(9, -1.0f, 0, 0);
mMotionSeqMngr.setNo(19, -1.0f, 0, 0);
mFaceMotionSeqMngr.setNo(MOT_UNK_9, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_19, -1.0f, 0, 0);
mMode = MODE_RUN;
}
case MODE_RUN:
@@ -1975,12 +2001,12 @@ int daNpc_Moi_c::talk(void* param_1) {
if (!mStagger.checkStagger()) {
if (field_0x165c) {
if (field_0x1669) {
mFaceMotionSeqMngr.setNo(21, -1.0f, 0, 0);
int motion_no;
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
Motion motion_no;
if (field_0x166b) {
motion_no = 10;
motion_no = MOT_UNK_10;
} else {
motion_no = 11;
motion_no = MOT_UNK_11;
}
mMotionSeqMngr.setNo(motion_no, -1.0f, 0, 0);
}
src/d/actor/d_a_npc_moir.cpp
+1 -1
View File
@@ -1281,7 +1281,7 @@ BOOL daNpcMoiR_c::multiTalk(void* param_1) {
fopAc_ac_c* speakers[4] = {this, mActorMngr[1].getActorP(), mActorMngr[2].getActorP(), mActorMngr[3].getActorP()};
dComIfGp_setMesgCameraInfoActor(speakers[0], speakers[1], speakers[2], speakers[3], NULL, NULL, NULL, NULL, NULL, NULL);
switch (field_0xe08) {
case 0:
initTalk(mMsgNo, NULL);
src/d/actor/d_a_npc_zrc.cpp
+23 -16
View File
@@ -190,7 +190,11 @@ char* daNpc_zrC_c::mEvtCutNameList[2] = {
/* 80B9397C-80B93994 000294 0018+00 1/2 0/0 0/0 .data mEvtCutList__11daNpc_zrC_c */
daNpc_zrC_c::EventFn daNpc_zrC_c::mEvtCutList[2] = {
NULL,
&ECut_earringGet,
&daNpc_zrC_c::ECut_earringGet,
};
enum Event_Cut_Nums {
/* 0x2 */ NUM_EVT_CUTS_e = 0x2,
};
/* 80B8DC0C-80B8DD90 0000EC 0184+00 1/1 0/0 0/0 .text __ct__11daNpc_zrC_cFv */
@@ -346,7 +350,7 @@ int daNpc_zrC_c::Execute() {
/* 80B8E884-80B8E914 000D64 0090+00 1/1 0/0 0/0 .text Draw__11daNpc_zrC_cFv */
int daNpc_zrC_c::Draw() {
mpMorf->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
BOOL is_test = chkAction(&test);
BOOL is_test = chkAction(&daNpc_zrC_c::test);
return draw(is_test, true, daNpc_zrC_Param_c::m.mShadowDepth, NULL, false);
}
@@ -1098,20 +1102,20 @@ BOOL daNpc_zrC_c::setAction(ActionFn i_action) {
BOOL daNpc_zrC_c::selectAction() {
mpNextActionFn = NULL;
if (daNpc_zrC_Param_c::m.mTest) {
mpNextActionFn = &test;
mpNextActionFn = &daNpc_zrC_c::test;
} else {
switch (mType) {
case 1:
mpNextActionFn = &waitSick;
mpNextActionFn = &daNpc_zrC_c::waitSick;
break;
case 2:
mpNextActionFn = &waitPray;
mpNextActionFn = &daNpc_zrC_c::waitPray;
break;
case 3:
mpNextActionFn = &waitThrone;
mpNextActionFn = &daNpc_zrC_c::waitThrone;
break;
default:
mpNextActionFn = &wait;
mpNextActionFn = &daNpc_zrC_c::wait;
break;
}
}
@@ -1147,17 +1151,18 @@ void daNpc_zrC_c::doNormalAction(BOOL param_0) {
/* 80B90D48-80B9113C 003228 03F4+00 1/1 0/0 0/0 .text doEvent__11daNpc_zrC_cFv */
// NONMATCHING minor regalloc
BOOL daNpc_zrC_c::doEvent() {
dEvent_manager_c* event_mgr = NULL;
BOOL ret = 0;
if (dComIfGp_event_runCheck() != FALSE) {
dEvent_manager_c& event_mgr = dComIfGp_getEventManager();
event_mgr = &dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mSpeakEvent)
{
mOrderNewEvt = false;
}
if (eventInfo.checkCommandTalk()) {
if (chkAction(&talk)) {
if (chkAction(&daNpc_zrC_c::talk)) {
(this->*mpActionFn)(NULL);
} else if (dComIfGp_event_chkTalkXY()) {
if (dComIfGp_evmng_ChkPresentEnd()) {
@@ -1174,7 +1179,7 @@ BOOL daNpc_zrC_c::doEvent() {
}
}
} else {
setAction(&talk);
setAction(&daNpc_zrC_c::talk);
}
ret = TRUE;
@@ -1184,18 +1189,20 @@ BOOL daNpc_zrC_c::doEvent() {
mItemID = -1;
}
int staff_id = event_mgr.getMyStaffId(l_myName, NULL, 0);
int staff_id = event_mgr->getMyStaffId(l_myName, NULL, 0);
if (staff_id != -1) {
mStaffID = staff_id;
int act_idx = event_mgr.getMyActIdx(staff_id, mEvtCutNameList, 2, 0, 0);
if ((this->*mEvtCutList[act_idx])(staff_id)) {
event_mgr.cutEnd(staff_id);
int evtCutNo = event_mgr->getMyActIdx(staff_id, mEvtCutNameList, 2, 0, 0);
JUT_ASSERT(0x8ca, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e));
JUT_ASSERT(0x8cb, 0 != mEvtCutList[evtCutNo]);
if ((this->*mEvtCutList[evtCutNo])(staff_id)) {
event_mgr->cutEnd(staff_id);
}
ret = TRUE;
}
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1
&& event_mgr.endCheck(mEventIdx)) {
&& event_mgr->endCheck(mEventIdx)) {
dComIfGp_event_reset();
mOrderEvtNo = EVT_NONE;
mEventIdx = -1;
@@ -1203,8 +1210,8 @@ BOOL daNpc_zrC_c::doEvent() {
}
}
int msg_timer = mMsgTimer;
int expression, motion;
int msg_timer = mMsgTimer;
if (ctrlMsgAnm(expression, motion, this, FALSE)) {
if (!field_0x9eb) {
setExpression(expression, -1.0f);

Some files were not shown because too many files have changed in this diff Show More