mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-18 05:08:57 -04:00
Update all code to use the new enum formats
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
#include "d/dolzel_rel.h" // IWYU pragma: keep
|
||||
#include "d/actor/d_a_sbox.h"
|
||||
#include "d/actor/d_a_ship.h"
|
||||
#include "d/res/res_dalways.h"
|
||||
#include "res/Object/Dalways.h"
|
||||
#include "d/d_kankyo.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
@@ -20,10 +20,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* a_this) {
|
||||
|
||||
/* 00000098-0000034C .text CreateHeap__8daSbox_cFv */
|
||||
BOOL daSbox_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", DALWAYS_BDL_BOXSEA));
|
||||
J3DModelData* modelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_BOXSEA_e));
|
||||
JUT_ASSERT(113, modelData != NULL);
|
||||
|
||||
if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_BOXOPENBOX)), true, J3DFrameCtrl::EMode_NONE))
|
||||
if (!mBck1.init(modelData, (J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_BOXOPENBOX_e)), true, J3DFrameCtrl::EMode_NONE))
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
@@ -33,7 +33,7 @@ BOOL daSbox_c::CreateHeap() {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
J3DModelData* flashModelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH));
|
||||
J3DModelData* flashModelData = (J3DModelData*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BDL_IT_TAKARA_FLASH_e));
|
||||
JUT_ASSERT(140, flashModelData != NULL);
|
||||
|
||||
mpModel2 = mDoExt_J3DModel__create(flashModelData, 0x80000, 0x1000200);
|
||||
@@ -43,7 +43,7 @@ BOOL daSbox_c::CreateHeap() {
|
||||
|
||||
if (!mBck2.init(
|
||||
flashModelData,
|
||||
(J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", DALWAYS_BCK_IT_TAKARA_FLASH2)),
|
||||
(J3DAnmTransform*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BCK_IT_TAKARA_FLASH2_e)),
|
||||
true,
|
||||
J3DFrameCtrl::EMode_NONE,
|
||||
1.0f,
|
||||
@@ -57,7 +57,7 @@ BOOL daSbox_c::CreateHeap() {
|
||||
|
||||
if (!mBtk.init(
|
||||
flashModelData,
|
||||
(J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Dalways", DALWAYS_BTK_IT_TAKARA_FLASH)),
|
||||
(J3DAnmTextureSRTKey*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BTK_IT_TAKARA_FLASH_e)),
|
||||
true,
|
||||
J3DFrameCtrl::EMode_NONE,
|
||||
1.0f,
|
||||
@@ -72,7 +72,7 @@ BOOL daSbox_c::CreateHeap() {
|
||||
|
||||
if (!mBrk.init(
|
||||
flashModelData,
|
||||
(J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dalways", DALWAYS_BRK_IT_TAKARA_FLASH)),
|
||||
(J3DAnmTevRegKey*)(dComIfG_getObjectRes("Dalways", dRes_INDEX_DALWAYS_BRK_IT_TAKARA_FLASH_e)),
|
||||
true,
|
||||
J3DFrameCtrl::EMode_NONE,
|
||||
1.0f,
|
||||
|
||||
Reference in New Issue
Block a user