mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 02:38:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update all code to use the new enum formats

Browse Source
This commit is contained in:
LagoLunatic
2026-05-29 15:45:57 -04:00
parent 5ac87a6885
commit bae595b973
299 changed files with 5151 additions and 5134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ship.cpp
+62 -62
View File
@@ -21,7 +21,7 @@
#include "SSystem/SComponent/c_counter.h"
#include "d/actor/d_a_bomb.h"
#include "d/actor/d_a_grid.h"
#include "d/res/res_ship.h"
#include "res/Object/Ship.h"
static char l_arcName[] = "Ship";
static Vec l_cannon_top = {85.0f, 0.0f, 10.0f};
@@ -1326,9 +1326,9 @@ BOOL daShip_c::checkNextMode(int i_curMode) {
/* 00003490-0000358C .text setPartOnAnime__8daShip_cFUc */
void daShip_c::setPartOnAnime(u8 i_part) {
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_MAST_ON2);
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e);
mpBodyAnm->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f, 0.0f, -1.0f, NULL);
m0392 = SHIP_BCK_FN_MAST_ON2;
m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e;
mPart = i_part;
if (mPart == PART_STEER_e) {
seStart(JA_SE_SHIP_SAIL_OUT, &m0444);
@@ -1346,7 +1346,7 @@ void daShip_c::setPartOnAnime(u8 i_part) {
/* 0000358C-0000366C .text setPartOffAnime__8daShip_cFv */
void daShip_c::setPartOffAnime() {
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_MAST_OFF2);
J3DAnmTransform* pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e);
mpBodyAnm->setAnm(pAnimRes, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f, 0.0f, -1.0f, NULL);
if (mPart == PART_CRANE_e) {
seStart(JA_SE_LK_SHIP_CRANE_IN, &m0444);
@@ -1357,7 +1357,7 @@ void daShip_c::setPartOffAnime() {
else {
seStart(JA_SE_SHIP_SAIL_IN, &m0444);
}
m0392 = SHIP_BCK_FN_MAST_OFF2;
m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e;
offStateFlg(daSFLG_SAIL_ON_e);
}
@@ -1365,13 +1365,13 @@ void daShip_c::setPartOffAnime() {
void daShip_c::setPartAnimeInit(u8 i_part) {
float fVar1 = 1.0f - mpBodyAnm->getFrame() / mpBodyAnm->getEndFrame();
if (i_part == 0) {
if (m0392 == SHIP_BCK_FN_MAST_ON2) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) {
setPartOffAnime();
mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame());
}
}
else if (mPart != i_part) {
if (m0392 == SHIP_BCK_FN_MAST_ON2) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) {
setPartOffAnime();
mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame());
}
@@ -1379,7 +1379,7 @@ void daShip_c::setPartAnimeInit(u8 i_part) {
setPartOnAnime(i_part);
}
}
else if (m0392 == SHIP_BCK_FN_MAST_OFF2) {
else if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOnAnime(i_part);
mpBodyAnm->setFrame(fVar1 * mpBodyAnm->getEndFrame());
}
@@ -1438,7 +1438,7 @@ BOOL daShip_c::procWait_init() {
mCurMode = MODE_WAIT_e;
mProc = &daShip_c::procWait;
m037A = 0;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
return TRUE;
@@ -1515,7 +1515,7 @@ BOOL daShip_c::procReady() {
BOOL daShip_c::procGetOff_init() {
mCurMode = MODE_GET_OFF_FIRST_e;
mProc = &daShip_c::procGetOff;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
speedF = 0.0f;
@@ -1559,7 +1559,7 @@ BOOL daShip_c::procPaddleMove_init() {
mProc = &daShip_c::procPaddleMove;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
@@ -1628,7 +1628,7 @@ BOOL daShip_c::procSteerMove() {
setMoveAngle(m0366);
}
setSailAngle();
if (m0392 == SHIP_BCK_FN_MAST_ON2 && mpBodyAnm->getFrame() >= 7.0f && mPart == PART_STEER_e) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e && mpBodyAnm->getFrame() >= 7.0f && mPart == PART_STEER_e) {
onStateFlg(daSFLG_SAIL_ON_e);
}
if (!checkStateFlg(daSFLG_FLY_e)) {
@@ -1681,7 +1681,7 @@ BOOL daShip_c::procSteerMove() {
}
if (!dComIfGp_event_runCheck() &&
!daPy_getPlayerLinkActorClass()->checkNoControll() &&
m0392 == SHIP_BCK_FN_MAST_ON2 &&
m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e &&
mpBodyAnm->getFrame() >= 7.0f &&
!checkStateFlg(daSFLG_FLY_e) &&
mFwdVel > 16.5f) {
@@ -2117,7 +2117,7 @@ BOOL daShip_c::procZevDemo() {
cXyz local_70;
cXyz local_64;
if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (!dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) && m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
if (mEvtStaffId != -1) {
@@ -2142,7 +2142,7 @@ BOOL daShip_c::procZevDemo() {
if (talkP && *talkP == 1) {
if (!checkStateFlg(daSFLG_UNK8000_e)) {
m038A = SHIP_BCK_FN_TALK_A;
m038A = dRes_INDEX_SHIP_BCK_FN_TALK_A_e;
mAnmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m038A);
mFrameCtrl.init(mAnmTransform->getFrameMax());
onStateFlg(daSFLG_UNK8000_e);
@@ -2192,10 +2192,10 @@ BOOL daShip_c::procZevDemo() {
u16 fileIndex;
if (mPart != PART_WAIT_e) {
fileIndex = SHIP_BCK_FN_MAST_ON2;
fileIndex = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e;
}
else {
fileIndex = SHIP_BCK_FN_MAST_OFF2;
fileIndex = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e;
m03E8 = 0.001f;
}
if (m0392 != fileIndex) {
@@ -2302,9 +2302,9 @@ BOOL daShip_c::procZevDemo() {
}
else if (m0351 == DEMO_RACE_FAIL_e) {
if (!checkStateFlg(daSFLG_UNK10000_e)) {
mpHeadAnm->setAnm((J3DAnmTransform *)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_LOSE1), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
mpHeadAnm->setAnm((J3DAnmTransform *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_LOSE1_e), J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
onStateFlg(daSFLG_UNK10000_e);
m03B4 = SHIP_BCK_FN_LOSE1;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOSE1_e;
}
speedF = 0.0f;
@@ -2326,10 +2326,10 @@ BOOL daShip_c::procZevDemo() {
u16 fileIndex;
if (partP == NULL || !(*partP & 1)) {
fileIndex = SHIP_BCK_FN_LOOK_R;
fileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e;
}
else {
fileIndex = SHIP_BCK_FN_LOOK_L;
fileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
f32 fVar17;
@@ -2449,17 +2449,17 @@ BOOL daShip_c::procTalkReady_init() {
mAnmTransform = NULL;
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
if ((s16)(shape_angle.y - m038C) > 0) {
m03B4 = SHIP_BCK_FN_LOOK_R;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e;
}
else {
m03B4 = SHIP_BCK_FN_LOOK_L;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
}
else if ((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y) > 0) {
m03B4 = SHIP_BCK_FN_LOOK_L;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
else {
m03B4 = SHIP_BCK_FN_LOOK_R;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_R_e;
}
pAnimRes = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m03B4);
mpHeadAnm->setAnm(pAnimRes, 0, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
@@ -2483,7 +2483,7 @@ BOOL daShip_c::procTalk_init() {
mProc = &daShip_c::procTalk;
mCurMode = MODE_TALK_e;
m0430 = fpcM_ERROR_PROCESS_ID_e;
m038A = SHIP_BCK_FN_TALK_A;
m038A = dRes_INDEX_SHIP_BCK_FN_TALK_A_e;
mAnmTransform = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, m038A);
mFrameCtrl.init(mAnmTransform->getFrameMax());
setInitMessage();
@@ -2528,10 +2528,10 @@ BOOL daShip_c::procTalk() {
}
if (mFrameCtrl.checkState(2)) {
if (cM_rndF(2.0f) < 1.0f) {
fileIndex = SHIP_BCK_FN_TALK_A;
fileIndex = dRes_INDEX_SHIP_BCK_FN_TALK_A_e;
}
else {
fileIndex = SHIP_BCK_FN_TALK_B;
fileIndex = dRes_INDEX_SHIP_BCK_FN_TALK_B_e;
}
if (fileIndex != m038A) {
m038A = fileIndex;
@@ -2681,7 +2681,7 @@ BOOL daShip_c::procStartModeWarp_init() {
onStateFlg(daSFLG_FLY_e);
mProc = &daShip_c::procStartModeWarp;
mCurMode = MODE_START_MODE_WARP_e;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
m03A6 = 0x1C25;
@@ -2780,7 +2780,7 @@ BOOL daShip_c::procTactWarp_init() {
mCurMode = MODE_TACT_WARP_e;
mProc = &daShip_c::procTactWarp;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
m03A6 = 0;
@@ -2906,7 +2906,7 @@ BOOL daShip_c::procStartModeThrow_init() {
onStateFlg(daSFLG_FLY_e);
mProc = &daShip_c::procStartModeThrow;
mCurMode = MODE_START_MODE_THROW_e;
if (m0392 != SHIP_BCK_FN_MAST_OFF2) {
if (m0392 != dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
setPartOffAnime();
}
m03A6 = l_HIO.throw_return_angle_speed;
@@ -3292,7 +3292,7 @@ void daShip_c::setRopePos() {
);
mDoMtx_stack_c::XrotM(-0x4000);
if (m0392 == SHIP_BCK_FN_MAST_ON2) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e) {
J3DTransformInfo sp104;
mpBodyAnm->getAnm()->getTransform(6, &sp104);
mDoMtx_stack_c::scaleM(sp104.mScale.x, sp104.mScale.y, sp104.mScale.z);
@@ -3390,7 +3390,7 @@ void daShip_c::setRopePos() {
/* 00009314-00009384 .text getAnglePartRate__8daShip_cFv */
f32 daShip_c::getAnglePartRate() {
float fVar1;
if (m0392 == SHIP_BCK_FN_MAST_OFF2) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
fVar1 = 0.33333334f * (3.0f - mpBodyAnm->getFrame());
}
else {
@@ -3472,16 +3472,16 @@ void daShip_c::setHeadAnm() {
(dComIfGp_evmng_startCheck("SV_TALK_P1_1ST") ||
dComIfGp_evmng_startCheck("SV_TALK_P1_2ND") ||
dComIfGp_evmng_startCheck("SV_TALK_P4_1ST"))) {
newFileIndex = SHIP_BCK_KYAKKAN1;
} else if (m03B4 == SHIP_BCK_KYAKKAN1 || m03B4 == SHIP_BCK_DAMAGE1) {
newFileIndex = SHIP_BCK_FN_LOOK_L;
newFileIndex = dRes_INDEX_SHIP_BCK_KYAKKAN1_e;
} else if (m03B4 == dRes_INDEX_SHIP_BCK_KYAKKAN1_e || m03B4 == dRes_INDEX_SHIP_BCK_DAMAGE1_e) {
newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
}
else if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
if (dComIfGp_checkPlayerStatus0(0, daPyStts0_BOW_AIM_e | daPyStts0_SUBJECT_e | daPyStts0_HOOKSHOT_AIM_e | daPyStts0_BOOMERANG_AIM_e | daPyStts0_TELESCOPE_LOOK_e) ||
dComIfGp_checkPlayerStatus1(0, daPyStts1_PICTO_BOX_AIM_e) ||
mCurMode == 9) {
newFileIndex = SHIP_BCK_KYAKKAN1;
newFileIndex = dRes_INDEX_SHIP_BCK_KYAKKAN1_e;
}
else if (
#if VERSION > VERSION_DEMO
@@ -3489,11 +3489,11 @@ void daShip_c::setHeadAnm() {
#endif
(mSph.ChkTgHit() || mCyl[0].ChkTgHit() ||
mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) {
m03B4 = SHIP_BCK_FN_LOOK_L;
newFileIndex = SHIP_BCK_DAMAGE1;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
newFileIndex = dRes_INDEX_SHIP_BCK_DAMAGE1_e;
}
else if (m03B4 != SHIP_BCK_DAMAGE1 || std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f) {
newFileIndex = SHIP_BCK_FN_LOOK_L;
else if (m03B4 != dRes_INDEX_SHIP_BCK_DAMAGE1_e || std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f) {
newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
}
else {
@@ -3503,34 +3503,34 @@ void daShip_c::setHeadAnm() {
#endif
(mSph.ChkTgHit() || mCyl[0].ChkTgHit() ||
mCyl[1].ChkTgHit() || mCyl[2].ChkTgHit())) {
m03B4 = SHIP_BCK_FN_LOOK_L;
newFileIndex = SHIP_BCK_DAMAGE1;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
newFileIndex = dRes_INDEX_SHIP_BCK_DAMAGE1_e;
}
else if (m03B4 == SHIP_BCK_DAMAGE1 || m03B4 == SHIP_BCK_AKIBI1) {
else if (m03B4 == dRes_INDEX_SHIP_BCK_DAMAGE1_e || m03B4 == dRes_INDEX_SHIP_BCK_AKIBI1_e) {
if (mpHeadAnm->getPlaySpeed() < 0.01f) {
newFileIndex = SHIP_BCK_FN_LOOK_L;
newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
}
else if ((m03B4 == SHIP_BCK_FN_LOOK_L || m03B4 == SHIP_BCK_FN_LOOK_R) &&
else if ((m03B4 == dRes_INDEX_SHIP_BCK_FN_LOOK_L_e || m03B4 == dRes_INDEX_SHIP_BCK_FN_LOOK_R_e) &&
std::fabsf(mpHeadAnm->getPlaySpeed()) < 0.01f &&
cM_rnd() < 0.4f && (g_Counter.mTimer & 0x1FF) == 0x1FF &&
#if VERSION > VERSION_DEMO
(!dComIfGs_isEventBit(dSv_event_flag_c::UNK_3910) || dComIfGs_isEventBit(dSv_event_flag_c::UNK_2D02)) &&
#endif
!checkStateFlg(daSFLG_UNK40000000_e)) {
newFileIndex = SHIP_BCK_AKIBI1;
newFileIndex = dRes_INDEX_SHIP_BCK_AKIBI1_e;
}
else if (m03B4 != SHIP_BCK_FN_LOOK_R) {
newFileIndex = SHIP_BCK_FN_LOOK_L;
else if (m03B4 != dRes_INDEX_SHIP_BCK_FN_LOOK_R_e) {
newFileIndex = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
}
}
if (m03B4 != newFileIndex && newFileIndex != -1) {
if (newFileIndex == SHIP_BCK_AKIBI1) {
if (newFileIndex == dRes_INDEX_SHIP_BCK_AKIBI1_e) {
speed = 1.0f;
morph = 5.0f;
}
else if (newFileIndex == SHIP_BCK_DAMAGE1) {
else if (newFileIndex == dRes_INDEX_SHIP_BCK_DAMAGE1_e) {
speed = 1.0f;
morph = 0.0f;
}
@@ -3983,7 +3983,7 @@ BOOL daShip_c::execute() {
mpHeadAnm->calc();
if (mPart == PART_CRANE_e) {
if (m0392 == SHIP_BCK_FN_MAST_OFF2) {
if (m0392 == dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e) {
f32 rate = getAnglePartRate();
m0398 = rate * mCraneBaseAngle;
m039C *= getAnglePartRate();
@@ -4404,12 +4404,12 @@ BOOL daShip_c::createHeap() {
J3DModelData* modelData;
if (checkStateFlg(daSFLG_SAIL_ON_e)) {
m0392 = SHIP_BCK_FN_MAST_ON2;
m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_ON2_e;
}
else {
m0392 = SHIP_BCK_FN_MAST_OFF2;
m0392 = dRes_INDEX_SHIP_BCK_FN_MAST_OFF2_e;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_BODY);
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_FN_BODY_e);
JUT_ASSERT(DEMO_SELECT(6969, 7004), modelData != NULL);
mpBodyAnm = new mDoExt_McaMorf(
@@ -4434,7 +4434,7 @@ BOOL daShip_c::createHeap() {
return FALSE;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCN);
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_VFNCN_e);
JUT_ASSERT(DEMO_SELECT(7006, 7041), modelData != NULL);
mpCannonModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -4442,7 +4442,7 @@ BOOL daShip_c::createHeap() {
return FALSE;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_VFNCR);
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_VFNCR_e);
JUT_ASSERT(DEMO_SELECT(7019, 7054), modelData != NULL);
mpSalvageArmModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -4450,7 +4450,7 @@ BOOL daShip_c::createHeap() {
return FALSE;
}
modelData = (J3DModelData *)dComIfG_getObjectRes("Link", LINK_BDL_ROPEEND);
modelData = (J3DModelData *)dComIfG_getObjectRes("Link", dRes_INDEX_LINK_BDL_ROPEEND_e);
JUT_ASSERT(DEMO_SELECT(7032, 7067), modelData != NULL);
mpLinkModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002);
@@ -4458,14 +4458,14 @@ BOOL daShip_c::createHeap() {
return FALSE;
}
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, SHIP_BDL_FN_HEAD_H);
modelData = (J3DModelData *)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BDL_FN_HEAD_H_e);
JUT_ASSERT(DEMO_SELECT(7045, 7080), modelData != NULL);
m03B4 = SHIP_BCK_FN_LOOK_L;
m03B4 = dRes_INDEX_SHIP_BCK_FN_LOOK_L_e;
mpHeadAnm = new mDoExt_McaMorf(
modelData, NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectRes(l_arcName, SHIP_BCK_FN_LOOK_L),
(J3DAnmTransformKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_SHIP_BCK_FN_LOOK_L_e),
J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 0, NULL,
0x80000, 0x11000002
);
@@ -4474,7 +4474,7 @@ BOOL daShip_c::createHeap() {
return FALSE;
}
mpHeadAnm->setMorf(3.0f);
if (mRopeLine.init(1, 0xFA, (ResTIMG*)dComIfG_getObjectRes("Always", ALWAYS_BTI_ROPE), 0)) {
if (mRopeLine.init(1, 0xFA, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 0)) {
return TRUE;
} else {
return FALSE;