mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-16 14:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code for various actors

Browse Source
This commit is contained in:
LagoLunatic
2023-10-29 02:07:52 -04:00
parent ba28e8e9ac
commit 2c907c8a21
17 changed files with 116 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main.h
+2 -1
View File
@@ -2053,7 +2053,8 @@ public:
int getStartRoomNo() { return fopAcM_GetParam(this) & 0x3F; }
int getStartMode() { return (fopAcM_GetParam(this) >> 0x0C) & 0xF; }
int getStartEvent() { return (fopAcM_GetParam(this) >> 0x18) & 0xFF; }
int getPhase() { return 0; } // TODO
request_of_phase_process_class* getPhase() { return &mPhsLoad; }
virtual MtxP getLeftHandMatrix() { return mpCLModel->getAnmMtx(0x08); } // cl_LhandA joint
virtual MtxP getRightHandMatrix() { return mpCLModel->getAnmMtx(0x0C); } // cl_RhandA joint
include/f_op/f_op_actor.h
-2
View File
@@ -172,8 +172,6 @@ struct actor_place {
};
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u8 mDistances[8];
/* 0x08 */ cXyz mPosition;
/* 0x14 */ u32 mFlags;
src/c/c_damagereaction.cpp
+1 -1
View File
@@ -245,7 +245,7 @@ BOOL enemy_ice(enemyice* ei) {
ei->mSpeed.y = 20.0f + g_regHIO.mChild[0].mFloatRegs[6];
} else {
ei->mSpeedF = 5.0f;
ei->mSpeed.y = -15.0;
ei->mSpeed.y = -15.0f;
}
ei->mAngleY = player->shape_angle.y;
ei->mState = 2;
src/d/actor/d_a_am2.cpp
+2 -2
View File
@@ -1299,14 +1299,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) {
i_this->mpBtkAnm = new mDoExt_btkAnm();
if (!i_this->mpBtkAnm) { return FALSE; }
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("AM2", AM2_BTK_AM2);
int ret = i_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, 2, 1.0, 0, -1, false, 0);
int ret = i_this->mpBtkAnm->init(model->getModelData(), pbtk, TRUE, 2, 1.0f, 0, -1, false, 0);
if (!ret) { return FALSE; }
if (!i_this->mpBtkAnm) { return FALSE; }
i_this->mpBrkAnm = new mDoExt_brkAnm();
if (!i_this->mpBrkAnm) { return FALSE; }
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("AM2", AM2_BRK_AM2);
ret = i_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, 2, 1.0, 0, -1, false, 0);
ret = i_this->mpBrkAnm->init(model->getModelData(), pbrk, TRUE, 2, 1.0f, 0, -1, false, 0);
if (!ret) { return FALSE; }
if (!i_this->mpBrkAnm) { return FALSE; }
src/d/actor/d_a_andsw2.cpp
+37 -37
View File
@@ -34,7 +34,7 @@ public:
u8 getTopSw();
BOOL chkAllSw2();
inline s32 execute();
inline BOOL execute();
inline s32 create();
public:
@@ -105,7 +105,7 @@ BOOL daAndsw2_c::chkAllSw2() {
}
/* 000001D8-000002B0 .text daAndsw2_actionOnAll__FP10daAndsw2_c */
static s32 daAndsw2_actionOnAll(daAndsw2_c* i_this) {
static BOOL daAndsw2_actionOnAll(daAndsw2_c* i_this) {
if (i_this->chkAllSw2()) {
if (i_this->getTimer() != 0xFF) {
i_this->mTimer = i_this->getTimer()*15;
@@ -124,11 +124,11 @@ static s32 daAndsw2_actionOnAll(daAndsw2_c* i_this) {
}
}
}
return 1;
return TRUE;
}
/* 000002B0-00000380 .text daAndsw2_actionTimer__FP10daAndsw2_c */
static s32 daAndsw2_actionTimer(daAndsw2_c* i_this) {
static BOOL daAndsw2_actionTimer(daAndsw2_c* i_this) {
if (i_this->getType() == TYPE_CONTINUOUS && !i_this->chkAllSw2()) {
i_this->mAction = ACT_ON_ALL;
} else if (i_this->mTimer > 0) {
@@ -144,11 +144,11 @@ static s32 daAndsw2_actionTimer(daAndsw2_c* i_this) {
i_this->mAction = ACT_WAIT;
}
}
return 1;
return TRUE;
}
/* 00000380-00000438 .text daAndsw2_actionOrder__FP10daAndsw2_c */
static s32 daAndsw2_actionOrder(daAndsw2_c* i_this) {
static BOOL daAndsw2_actionOrder(daAndsw2_c* i_this) {
if (i_this->mEvtInfo.checkCommandDemoAccrpt()) {
i_this->mAction = ACT_EVENT;
int room = i_this->getRoomNo();
@@ -159,11 +159,11 @@ static s32 daAndsw2_actionOrder(daAndsw2_c* i_this) {
} else {
fopAcM_orderOtherEventId(i_this, i_this->mEventIdx, i_this->getEventNo(), 0xFFFF, 0, 1);
}
return 1;
return TRUE;
}
/* 00000438-000004BC .text daAndsw2_actionEvent__FP10daAndsw2_c */
static s32 daAndsw2_actionEvent(daAndsw2_c* i_this) {
static BOOL daAndsw2_actionEvent(daAndsw2_c* i_this) {
if (dComIfGp_evmng_endCheck(i_this->mEventIdx)) {
if (i_this->getType() == TYPE_CONTINUOUS) {
i_this->mAction = ACT_OFF;
@@ -172,27 +172,27 @@ static s32 daAndsw2_actionEvent(daAndsw2_c* i_this) {
}
dComIfGp_event_reset();
}
return 1;
return TRUE;
}
/* 000004BC-00000528 .text daAndsw2_actionOff__FP10daAndsw2_c */
static s32 daAndsw2_actionOff(daAndsw2_c* i_this) {
static BOOL daAndsw2_actionOff(daAndsw2_c* i_this) {
if (!i_this->chkAllSw2()) {
i_this->mAction = ACT_ON_ALL;
int room = i_this->getRoomNo();
int sw = i_this->getSwbit();
dComIfGs_offSwitch(sw, room);
}
return 1;
return TRUE;
}
/* 00000528-00000530 .text daAndsw2_actionWait__FP10daAndsw2_c */
static s32 daAndsw2_actionWait(daAndsw2_c* i_this) {
return 1;
static BOOL daAndsw2_actionWait(daAndsw2_c* i_this) {
return TRUE;
}
s32 daAndsw2_c::execute() {
static s32 (*l_action[6])(daAndsw2_c*) = {
BOOL daAndsw2_c::execute() {
static BOOL (*l_action[6])(daAndsw2_c*) = {
daAndsw2_actionOnAll,
daAndsw2_actionTimer,
daAndsw2_actionOrder,
@@ -201,7 +201,7 @@ s32 daAndsw2_c::execute() {
daAndsw2_actionWait,
};
l_action[mAction](this);
return 1;
return TRUE;
}
s32 daAndsw2_c::create() {
@@ -249,24 +249,24 @@ s32 daAndsw2_c::create() {
}
/* 00000530-00000538 .text daAndsw2_Draw__FP10daAndsw2_c */
static s32 daAndsw2_Draw(daAndsw2_c* i_this) {
return 1;
static BOOL daAndsw2_Draw(daAndsw2_c* i_this) {
return TRUE;
}
/* 00000538-00000574 .text daAndsw2_Execute__FP10daAndsw2_c */
static s32 daAndsw2_Execute(daAndsw2_c* i_this) {
static BOOL daAndsw2_Execute(daAndsw2_c* i_this) {
return i_this->execute();
}
/* 00000574-0000057C .text daAndsw2_IsDelete__FP10daAndsw2_c */
static s32 daAndsw2_IsDelete(daAndsw2_c* i_this) {
return 1;
static BOOL daAndsw2_IsDelete(daAndsw2_c* i_this) {
return TRUE;
}
/* 0000057C-000005AC .text daAndsw2_Delete__FP10daAndsw2_c */
static s32 daAndsw2_Delete(daAndsw2_c* i_this) {
static BOOL daAndsw2_Delete(daAndsw2_c* i_this) {
i_this->~daAndsw2_c();
return 1;
return TRUE;
}
/* 000005AC-00000724 .text daAndsw2_Create__FP10fopAc_ac_c */
@@ -283,18 +283,18 @@ static actor_method_class l_daAndsw2_Method = {
};
actor_process_profile_definition g_profile_ANDSW2 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
PROC_ANDSW2,
&g_fpcLf_Method.mBase,
sizeof(daAndsw2_c),
0,
0,
&g_fopAc_Method.base,
0x0136,
&l_daAndsw2_Method,
fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_6_e,
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 7,
/* ListPrio */ fpcPi_CURRENT_e,
/* ProcName */ PROC_ANDSW2,
/* Proc SubMtd */ &g_fpcLf_Method.mBase,
/* Size */ sizeof(daAndsw2_c),
/* SizeOther */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Priority */ 0x0136,
/* Actor SubMtd */ &l_daAndsw2_Method,
/* Status */ fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
/* Group */ fopAc_ACTOR_e,
/* CullType */ fopAc_CULLBOX_6_e,
};
src/d/actor/d_a_bomb.cpp
+2 -2
View File
@@ -944,7 +944,7 @@ bool daBomb_c::procWait() {
if(!temp && !field_0x781) {
bound(y_vel);
if((mAcch.ChkGroundHit() || chk_state(STATE_5)) && !mAcch.ChkGroundLanding()) {
mAttentionInfo.setFlag(fopAc_Attn_ACTION_CARRY_e);
mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
}
else {
mAttentionInfo.mFlags &= ~fopAc_Attn_ACTION_CARRY_e;
@@ -1224,7 +1224,7 @@ void daBomb_c::create_init() {
mRestTime = 0x96;
mInitialState = prm_get_state();
if(!chk_state(STATE_4)) {
mAttentionInfo.setFlag(fopAc_Attn_ACTION_CARRY_e);
mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
}
field_0x77C = 0;
src/d/actor/d_a_bomb2.cpp
+1 -1
View File
@@ -703,7 +703,7 @@ namespace daBomb2 {
}
void Act_c::on_carry() {
mAttentionInfo.setFlag(fopAc_Attn_ACTION_CARRY_e);
mAttentionInfo.mFlags |= fopAc_Attn_ACTION_CARRY_e;
}
void Act_c::off_carry() {
src/d/actor/d_a_itembase.cpp
+5 -5
View File
@@ -62,7 +62,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAn
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm1);
JUT_ASSERT(140, pbtk != 0);
mpBtkAnm1 = new mDoExt_btkAnm();
if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, 2, 1.0, 0, -1, false, 0)) {
if (!mpBtkAnm1 || !mpBtkAnm1->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
}
@@ -72,7 +72,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAn
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(resName, btkAnm2);
JUT_ASSERT(156, pbtk != 0);
mpBtkAnm2 = new mDoExt_btkAnm();
if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, 2, 1.0, 0, -1, false, 0)) {
if (!mpBtkAnm2 || !mpBtkAnm2->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1, false, 0)) {
return FALSE;
}
}
@@ -88,7 +88,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAn
shouldAnimate = FALSE;
}
mpBrkAnm1 = new mDoExt_brkAnm();
if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, 2, 1.0, 0, -1, false, false)) {
if (!mpBrkAnm1 || !mpBrkAnm1->init(modelData, pbrk, shouldAnimate, 2, 1.0f, 0, -1, false, false)) {
return FALSE;
}
}
@@ -98,7 +98,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAn
pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(resName, brkAnm2);
JUT_ASSERT(197, pbrk != 0);
mpBrkAnm2 = new mDoExt_brkAnm();
if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, 2, 1.0, 0, -1, false, false)) {
if (!mpBrkAnm2 || !mpBrkAnm2->init(modelData, pbrk, TRUE, 2, 1.0f, 0, -1, false, false)) {
return FALSE;
}
}
@@ -109,7 +109,7 @@ BOOL daItemBase_c::CreateItemHeap(const char* resName, short resIdx, short btkAn
pbck = (J3DAnmTransform*)dComIfG_getObjectRes(resName, bckAnm);
JUT_ASSERT(212, pbck != 0);
mpBckAnm = new mDoExt_bckAnm();
if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2, 1.0, 0, -1, false)) {
if (!mpBckAnm || !mpBckAnm->init(modelData, pbck, TRUE, 2, 1.0f, 0, -1, false)) {
return FALSE;
}
}
src/d/actor/d_a_kytag04.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ static BOOL daKytag04_Execute(kytag04_class* i_this) {
i_this->mState = 0;
}
return 1;
return TRUE;
}
/* 00000138-00000160 .text daKytag04_IsDelete__FP13kytag04_class */
src/d/actor/d_a_kytag06.cpp
+4 -4
View File
@@ -25,10 +25,10 @@ static BOOL daKytag06_Execute(kytag06_class* i_this) {
int date;
if (g_dComIfG_gameInfo.play.mEvtCtrl.mMode == 0) {
return 1;
return TRUE;
}
if(dComIfGp_evmng_startCheck("ARRIVAL_BRK") == 0) {
return 1;
return TRUE;
}
time = dComIfGs_getTime();
@@ -45,8 +45,8 @@ static BOOL daKytag06_Execute(kytag06_class* i_this) {
dKyw_rain_set(date);
}
g_env_light.mThunderEff.mMode = 1;
cLib_addCalc(&i_this->field_0x294, 1.0f, 0.1f, 0.001f, 0.0001);
return 1;
cLib_addCalc(&i_this->field_0x294, 1.0f, 0.1f, 0.001f, 0.0001f);
return TRUE;
}
static BOOL daKytag06_IsDelete(kytag06_class*) {
src/d/actor/d_a_npc_md.cpp
+42 -42
View File
@@ -222,7 +222,7 @@ daNpc_Md_HIO2_c::daNpc_Md_HIO2_c() {
/* 00000274-00000574 .text __ct__14daNpc_Md_HIO_cFv */
daNpc_Md_HIO_c::daNpc_Md_HIO_c() {
m08C.m04 = -25.0;
m08C.m04 = -25.0f;
m08C.m08 = 0x2328;
m08C.m0C = 0x2328;
m08C.m0A = 0x0;
@@ -233,58 +233,58 @@ daNpc_Md_HIO_c::daNpc_Md_HIO_c() {
m08C.m16 = -0x1F40;
m08C.m18 = 0x1000;
m08C.m1A = 0x800;
m08C.m1C = 130.0;
m08C.m1C = 130.0f;
m08C.m20 = 0x4000;
m08C.m22 = 0x0;
m08C.m24 = 150.0;
m08C.m24 = 150.0f;
m0B4 = 0x0;
m0B8 = 770.0;
m0BC = 250.0;
m0C0 = -450.0;
m0C4 = 90.0;
m0C8 = 400.0;
m0CC = 600.0;
m0B8 = 770.0f;
m0BC = 250.0f;
m0C0 = -450.0f;
m0C4 = 90.0f;
m0C8 = 400.0f;
m0CC = 600.0f;
m0D0 = 0.05;
m0D4 = 17.0;
m0D8 = 0.0;
m0D4 = 17.0f;
m0D8 = 0.0f;
m0DC = 0.5;
m0E0 = 0.3;
m0E4 = 0.9;
m0E8 = 15.0;
m0EC = 22.0;
m0F0 = 9.0;
m0F4 = 4.0;
m0E8 = 15.0f;
m0EC = 22.0f;
m0F0 = 9.0f;
m0F4 = 4.0f;
m0F8 = -1.51367;
m0FC = -1.09863;
m100 = -0.56152;
m104 = 0.1;
m108 = 0.2;
m10C = 10.0;
m110 = -50.0;
m10C = 10.0f;
m110 = -50.0f;
m114 = 1.3;
m128 = 1200.0;
m12C = 1500.0;
m118 = 1.0;
m128 = 1200.0f;
m12C = 1500.0f;
m118 = 1.0f;
m11C = 1.5;
m120 = 2.0;
m120 = 2.0f;
m124 = 1.6;
m130 = 3.0;
m130 = 3.0f;
m134 = 1.25;
m138 = 0.2;
m13C = 100.0;
m140 = 50.0;
m144 = 9.0;
m13C = 100.0f;
m140 = 50.0f;
m144 = 9.0f;
m1B4 = 0x17;
m1B6 = 0x14;
m1C7 = 0x0;
m148 = 0.9;
m1C6 = 0x1;
m14C = 6.0;
m14C = 6.0f;
m1B8 = 0x4000;
m150 = 10.0;
m150 = 10.0f;
m1BA = 0x78;
m1BC = 0x1F4;
m154 = 5.0;
m154 = 5.0f;
m158 = 2.2;
m15C = -11.681;
m160 = 1.3;
@@ -292,27 +292,27 @@ daNpc_Md_HIO_c::daNpc_Md_HIO_c() {
m168 = 57.066;
m16C = 179.286;
m1C8 = 0x0;
m170 = 0.0;
m174 = 1.0;
m170 = 0.0f;
m174 = 1.0f;
m178 = 1.5;
m17C = -100.0;
m180 = 100.0;
m184 = 10.0;
m188 = 1.0;
m18C = -10.0;
m17C = -100.0f;
m180 = 100.0f;
m184 = 10.0f;
m188 = 1.0f;
m18C = -10.0f;
m1BE = 0x46;
m1C0 = 0x5;
m1C2 = 0x1C2;
m1C4 = 0x96;
m190 = 43.0;
m190 = 43.0f;
m194 = 14.65;
m198 = 13.99;
m19C = 0.0;
m1A0 = -98.0;
m1A4 = 0.0;
m1A8 = 3.0;
m1AC = 1000.0;
m1B0 = 1000.0;
m19C = 0.0f;
m1A0 = -98.0f;
m1A4 = 0.0f;
m1A8 = 3.0f;
m1AC = 1000.0f;
m1B0 = 1000.0f;
mChildID = -0x1;
}
src/d/actor/d_a_obj_homensmoke.cpp
+2 -2
View File
@@ -71,8 +71,8 @@ namespace daObjHomensmoke {
/* 0xC */ Vec mMax;
};
static daObjHomensmoke__cullbox culling_dat[2] = {
{-300.0, -30.0, -100.0, 300.0, 600.0, 300.0},
{-100.0, -30.0, -100.0, 100.0, 250.0, 120.0},
{-300.0f, -30.0f, -100.0f, 300.0f, 600.0f, 300.0f},
{-100.0f, -30.0f, -100.0f, 100.0f, 250.0f, 120.0f},
};
fopAcM_setCullSizeBox(this,
culling_dat[mType].mMin.x, culling_dat[mType].mMin.y, culling_dat[mType].mMin.z,
src/d/actor/d_a_obj_movebox.cpp
+1 -1
View File
@@ -1988,7 +1988,7 @@ namespace daObjMovebox {
if (!i_attr()->mbCastsShadow && mBgc.mMaxGroundIdx >= 0) {
int temp = mBgc.mMaxGroundIdx;
f32 groundH = mBgc.mGroundY[temp];
cM3dGPla* triPla = dComIfG_Bgsp()->i_GetTriPla(Bgc_c::M_gnd_work[temp]);
cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(Bgc_c::M_gnd_work[temp]);
if (triPla && groundH != -1000000000.0f) {
dComIfGd_setSimpleShadow(&current.pos, groundH, i_attr()->m10, &triPla->mNormal, shape_angle.y, 1.0f, NULL);
}
src/d/actor/d_a_obj_paper.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ namespace daObjPaper {
mAttentionInfo.mPosition.y += attributes[mType].mAttentionOffset;
mAttentionInfo.mDistances[1] = attributes[mType].mAttentionDist1;
mAttentionInfo.mDistances[3] = attributes[mType].mAttentionDist2;
mAttentionInfo.setFlag(fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_READ_e);
mAttentionInfo.mFlags |= fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_TALK_e | fopAc_Attn_TALKFLAG_READ_e;
mMsgId = -1;
src/d/actor/d_a_player_main.cpp
+1 -1
View File
@@ -2883,7 +2883,7 @@ static s32 daPy_Create(fopAc_ac_c* i_this) {
};
daPy_lk_c* player_link = (daPy_lk_c*)i_this;
return dComLbG_PhaseHandler(&player_link->mPhsLoad, (cPhs__Handler*)l_method, player_link);
return dComLbG_PhaseHandler(player_link->getPhase(), (cPhs__Handler*)l_method, player_link);
}
/* 80127BA0-80127CC0 .text setSeAnime__9daPy_lk_cFPC14daPy_anmHeap_cP12J3DFrameCtrl */
src/d/actor/d_a_tag_ret.cpp
+13 -13
View File
@@ -52,10 +52,10 @@ namespace daTagRet {
};
s32 _create();
s32 _delete();
bool _delete();
void set_mtx();
s32 _execute();
s32 _draw();
bool _execute();
bool _draw();
public:
u8 unknown_padding[0xC];
@@ -81,8 +81,8 @@ namespace daTagRet {
}
/* 0000038C-00000394 .text _delete__Q28daTagRet5Act_cFv */
s32 Act_c::_delete() {
return TRUE;
bool Act_c::_delete() {
return true;
}
/* 00000394-00000398 .text set_mtx__Q28daTagRet5Act_cFv */
@@ -91,7 +91,7 @@ namespace daTagRet {
}
/* 00000398-00000460 .text _execute__Q28daTagRet5Act_cFv */
s32 Act_c::_execute() {
bool Act_c::_execute() {
mCyl.SetC(current.pos);
mCyl.SetR(1000.0f*mScale.x);
mCyl.SetH(100.0f*mScale.y);
@@ -104,12 +104,12 @@ namespace daTagRet {
set_mtx();
return TRUE;
return true;
}
/* 00000460-00000468 .text _draw__Q28daTagRet5Act_cFv */
s32 Act_c::_draw() {
return TRUE;
bool Act_c::_draw() {
return true;
}
namespace {
@@ -119,22 +119,22 @@ namespace daTagRet {
}
/* 00000488-000004AC .text Mthd_Delete__Q28daTagRet25@unnamed@d_a_tag_ret_cpp@FPv */
u8 Mthd_Delete(void* i_this) {
BOOL Mthd_Delete(void* i_this) {
return ((Act_c*)i_this)->_delete();
}
/* 000004AC-000004D0 .text Mthd_Execute__Q28daTagRet25@unnamed@d_a_tag_ret_cpp@FPv */
u8 Mthd_Execute(void* i_this) {
BOOL Mthd_Execute(void* i_this) {
return ((Act_c*)i_this)->_execute();
}
/* 000004D0-000004F4 .text Mthd_Draw__Q28daTagRet25@unnamed@d_a_tag_ret_cpp@FPv */
u8 Mthd_Draw(void* i_this) {
BOOL Mthd_Draw(void* i_this) {
return ((Act_c*)i_this)->_draw();
}
/* 000004F4-000004FC .text Mthd_IsDelete__Q28daTagRet25@unnamed@d_a_tag_ret_cpp@FPv */
u8 Mthd_IsDelete(void* i_this) {
BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}
src/d/d_a_ship_static.cpp
+1 -2
View File
@@ -13,8 +13,7 @@ void daShip_c::initStartPos(const cXyz* pos, short rotY) {
shape_angle.y = rotY;
current.angle.y = shape_angle.y;
field_0x0358 &= 0xffffffef;
mGravity = -2.5;
mGravity = -2.5f;
mWaveR.remove();
mWaveL.remove();