mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 21:18:23 -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_fan.cpp
+9 -9
View File
@@ -5,9 +5,9 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_fan.h"
#include "d/res/res_hsen1.h"
#include "d/res/res_hsen3.h"
#include "d/res/res_yaflw00.h"
#include "res/Object/Hsen1.h"
#include "res/Object/Hsen3.h"
#include "res/Object/Yaflw00.h"
#include "f_op/f_op_kankyo_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_level_se.h"
@@ -16,8 +16,8 @@
const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", };
const char daFan_c::m_arcname2[8] = "Yaflw00";
const s16 daFan_c::m_bdlidx[3] = { HSEN1_BDL_HSEN1, HSEN1_BDL_HSEN1, HSEN3_BDL_HSEN3, };
const s16 daFan_c::m_dzbidx[3] = { HSEN1_DZB_HSEN1, HSEN1_DZB_HSEN1, HSEN3_DZB_HSEN3, };
const s16 daFan_c::m_bdlidx[3] = { dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN1_BDL_HSEN1_e, dRes_INDEX_HSEN3_BDL_HSEN3_e, };
const s16 daFan_c::m_dzbidx[3] = { dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN1_DZB_HSEN1_e, dRes_INDEX_HSEN3_DZB_HSEN3_e, };
const f32 daFan_c::m_wind_length[3] = { 1600.0f, 1600.0f, 1220.0f, };
const f32 daFan_c::m_wind_r[3] = { 120.0f, 120.0f, 780.0f, };
const Vec daFan_c::m_wind_model_scale[3] = { { 1.0f, 1.6f, 1.0f, }, { 1.0f, 1.6f, 1.0f, }, { 3.0f, 2.9f, 3.0f, }, };
@@ -78,23 +78,23 @@ BOOL daFan_c::CreateHeap() {
return FALSE;
mModel->setUserArea((u32)this);
modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BDL_YAFLW00);
modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BDL_YAFLW00_e);
JUT_ASSERT(0x17f, modelData != NULL);
mWindModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
if (mWindModel == NULL)
return FALSE;
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_01);
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_01_e);
JUT_ASSERT(400, pbtk != NULL);
if (!mWindBtkAnm0.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false, 0))
return FALSE;
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BTK_YAFLW00_02);
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BTK_YAFLW00_02_e);
JUT_ASSERT(0x19c, pbtk != NULL);
if (!mWindBtkAnm1.init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0,-1, false, 0))
return FALSE;
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, YAFLW00_BCK_YAFLW00);
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname2, dRes_INDEX_YAFLW00_BCK_YAFLW00_e);
JUT_ASSERT(0x1a9, pbck != NULL);
if (!mWindBckAnm.init(modelData, pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0,-1, false))
return FALSE;