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:
@@ -8,7 +8,7 @@
|
||||
#include "d/actor/d_a_player.h"
|
||||
#include "d/actor/d_a_ship.h"
|
||||
#include "d/d_lib.h"
|
||||
#include "d/res/res_gmjwp.h"
|
||||
#include "res/Object/Gmjwp.h"
|
||||
|
||||
const char daWarpgn_c::m_arcname[] = "Gmjwp";
|
||||
const u32 daWarpgn_c::m_heapsize = 0x3000;
|
||||
@@ -61,7 +61,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
|
||||
|
||||
/* 00000140-00000570 .text CreateHeap__10daWarpgn_cFv */
|
||||
BOOL daWarpgn_c::CreateHeap() {
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, GMJWP_BDL_GMJWP00);
|
||||
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BDL_GMJWP00_e);
|
||||
JUT_ASSERT(0xCF, modelData != NULL);
|
||||
|
||||
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000222);
|
||||
@@ -69,7 +69,7 @@ BOOL daWarpgn_c::CreateHeap() {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP00);
|
||||
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BTK_GMJWP00_e);
|
||||
JUT_ASSERT(0xDE, pbtk != NULL);
|
||||
mpBtkAnm1 = new mDoExt_btkAnm();
|
||||
if ((mpBtkAnm1 == NULL) || mpBtkAnm1->init(modelData, pbtk, true, J3DFrameCtrl::EMode_LOOP) == 0) {
|
||||
@@ -77,7 +77,7 @@ BOOL daWarpgn_c::CreateHeap() {
|
||||
}
|
||||
mpBtkAnm1->setPlaySpeed(1.0f);
|
||||
|
||||
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BTK_GMJWP02);
|
||||
pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BTK_GMJWP02_e);
|
||||
JUT_ASSERT(0xED, pbtk != NULL);
|
||||
mpBtkAnm2 = new mDoExt_btkAnm();
|
||||
if ((mpBtkAnm2 == NULL) || mpBtkAnm2->init(modelData, pbtk, true, J3DFrameCtrl::EMode_NONE) == 0) {
|
||||
@@ -85,7 +85,7 @@ BOOL daWarpgn_c::CreateHeap() {
|
||||
}
|
||||
mpBtkAnm2->setPlaySpeed(0.0f);
|
||||
|
||||
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, GMJWP_BRK_GMJWP01);
|
||||
J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BRK_GMJWP01_e);
|
||||
JUT_ASSERT(0xFF, pbrk != NULL);
|
||||
mpBrkAnm = new mDoExt_brkAnm();
|
||||
if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, true, J3DFrameCtrl::EMode_NONE) == 0) {
|
||||
@@ -93,7 +93,7 @@ BOOL daWarpgn_c::CreateHeap() {
|
||||
}
|
||||
mpBrkAnm->setPlaySpeed(0.0f);
|
||||
|
||||
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, GMJWP_BCK_GMJWP01);
|
||||
J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, dRes_INDEX_GMJWP_BCK_GMJWP01_e);
|
||||
JUT_ASSERT(0x10F, pbck != NULL);
|
||||
mpBckAnm = new mDoExt_bckAnm();
|
||||
if (mpBckAnm == NULL || mpBckAnm->init(modelData, pbck, true, J3DFrameCtrl::EMode_NONE) == 0) {
|
||||
|
||||
Reference in New Issue
Block a user