mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-29 08:30:08 -04:00
Update all code to use the new enum formats
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
#include "d/actor/d_a_obj_swlight.h"
|
||||
#include "d/res/res_mmirror.h"
|
||||
#include "res/Object/Mmirror.h"
|
||||
|
||||
namespace daObjSwlight {
|
||||
namespace {
|
||||
@@ -61,7 +61,7 @@ BOOL Act_c::solidHeapCB(fopAc_ac_c* i_this) {
|
||||
|
||||
/* 00000178-0000045C .text create_heap__Q212daObjSwlight5Act_cFv */
|
||||
bool Act_c::create_heap() {
|
||||
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, MMIRROR_BDL_MSUSW));
|
||||
J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BDL_MSUSW_e));
|
||||
JUT_ASSERT(317, modelData != NULL);
|
||||
|
||||
m298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x31000202);
|
||||
@@ -74,12 +74,12 @@ bool Act_c::create_heap() {
|
||||
m298->setUserArea((u32)this);
|
||||
}
|
||||
|
||||
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, MMIRROR_BTK_MSUSW));
|
||||
J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BTK_MSUSW_e));
|
||||
JUT_ASSERT(344, btk != NULL);
|
||||
|
||||
BOOL iVar4 = m29C.init(modelData, btk, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 0);
|
||||
|
||||
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(M_arcname, MMIRROR_BCK_MSUSW));
|
||||
J3DAnmTransform* bck = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_BCK_MSUSW_e));
|
||||
JUT_ASSERT(351, bck != NULL);
|
||||
|
||||
BOOL iVar6 = m2B0.init(modelData, bck, true, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false);
|
||||
@@ -87,7 +87,7 @@ bool Act_c::create_heap() {
|
||||
|
||||
m2C0 = new dBgW();
|
||||
if (m2C0 != NULL) {
|
||||
cBgD_t* bgw_data = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, MMIRROR_DZB_MSUSW));
|
||||
cBgD_t* bgw_data = static_cast<cBgD_t*>(dComIfG_getObjectRes(M_arcname, dRes_INDEX_MMIRROR_DZB_MSUSW_e));
|
||||
JUT_ASSERT(361, bgw_data != NULL);
|
||||
if (!m2C0->Set(bgw_data, cBgW::MOVE_BG_e, &mF38)) {
|
||||
bVar1 = true;
|
||||
|
||||
Reference in New Issue
Block a user