mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 13:13:29 -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_dk.h"
|
||||
#include "d/res/res_dk.h"
|
||||
#include "res/Object/Dk.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_s_play.h"
|
||||
#include "m_Do/m_Do_ext.h"
|
||||
@@ -311,10 +311,10 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
|
||||
dk_class* a_this = (dk_class*)i_this;
|
||||
|
||||
mDoExt_McaMorf* morf = new mDoExt_McaMorf(
|
||||
(J3DModelData*)dComIfG_getObjectIDRes("Dk", DK_BDL_DK),
|
||||
(J3DModelData*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_e),
|
||||
NULL,
|
||||
NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", DK_BCK_FLY1),
|
||||
(J3DAnmTransform*)dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BCK_FLY1_e),
|
||||
J3DFrameCtrl::EMode_LOOP,
|
||||
1.0f,
|
||||
0,
|
||||
@@ -337,7 +337,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
a_this->field_0x2B8->getModel()->setUserArea((u32) a_this);
|
||||
|
||||
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_KAMEN);
|
||||
J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_KAMEN_e);
|
||||
a_this->mpModelKamen = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020002);
|
||||
#if VERSION > VERSION_DEMO
|
||||
if (a_this->mpModelKamen == NULL) {
|
||||
@@ -345,7 +345,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
|
||||
}
|
||||
#endif
|
||||
|
||||
modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", DK_BDL_DK_TAIL);
|
||||
modelData = (J3DModelData*) dComIfG_getObjectIDRes("Dk", dRes_ID_DK_BDL_DK_TAIL_e);
|
||||
JUT_ASSERT(DEMO_SELECT(817, 819), modelData != NULL);
|
||||
|
||||
for (s32 i = 0; i < 4; i++) {
|
||||
|
||||
Reference in New Issue
Block a user