mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-17 21:03:35 -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_mozo.h"
|
||||
#include "d/res/res_mozo.h"
|
||||
#include "res/Object/Mozo.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -104,13 +104,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
|
||||
|
||||
/* 000007AC-00000A24 .text CreateHeap__8daMozo_cFv */
|
||||
BOOL daMozo_c::CreateHeap() {
|
||||
J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BDL_MOZ);
|
||||
J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BDL_MOZ_e);
|
||||
|
||||
mDoExt_McaMorf* newMorf = new mDoExt_McaMorf(
|
||||
mdlData,
|
||||
0,
|
||||
0,
|
||||
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", MOZO_INDEX_BCK_MOZ)),
|
||||
static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BCK_MOZ_e)),
|
||||
J3DFrameCtrl::EMode_LOOP,
|
||||
1.0f,
|
||||
0,
|
||||
@@ -123,10 +123,10 @@ BOOL daMozo_c::CreateHeap() {
|
||||
|
||||
mAnimMorf = newMorf;
|
||||
|
||||
m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BRK_MOZ);
|
||||
m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BRK_MOZ_e);
|
||||
JUT_ASSERT(0x16A, m_brk != NULL);
|
||||
|
||||
m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ);
|
||||
m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", dRes_INDEX_MOZO_BTK_MOZ_e);
|
||||
JUT_ASSERT(0x16D, m_btk != NULL);
|
||||
|
||||
int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE);
|
||||
|
||||
Reference in New Issue
Block a user