mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

J3DModel inlines cleanup, procBottleSwing_init match, etc

Browse Source
This commit is contained in:
LagoLunatic
2025-04-10 19:30:51 -04:00
parent 0bb7ff4051
commit 309158e274
51 changed files with 402 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_figure.cpp
+7 -5
View File
@@ -4,6 +4,8 @@
//
#include "d/actor/d_a_obj_figure.h"
#include "d/res/res_figure.h"
#include "d/res/res_figure2.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_com_inf_game.h"
#include "d/d_com_lib_game.h"
@@ -947,7 +949,7 @@ BOOL daObjFigure_c::createHeap() {
}
if(mFigureNo == 0x3D) {
J3DAnmTevRegKey* pBrkData = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectIDRes(arcname, 7));
J3DAnmTevRegKey* pBrkData = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectIDRes(arcname, FIGURE2_BDL_VF_047));
if(pBrkData == NULL) {
return false;
}
@@ -962,11 +964,11 @@ BOOL daObjFigure_c::createHeap() {
}
}
if(mFigureNo == 0x40) {
J3DModelData* p1 = (J3DModelData*)dComIfG_getObjectIDRes(arcname, 4);
J3DModelData* p1 = (J3DModelData*)dComIfG_getObjectIDRes(arcname, FIGURE2_BDL_VF_044);
mpMorf = new mDoExt_McaMorf(
p1,
NULL, NULL,
(J3DAnmTransformKey*)dComIfG_getObjectIDRes(arcname, 0),
(J3DAnmTransformKey*)dComIfG_getObjectIDRes(arcname, FIGURE2_BCK_VF_064L),
J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1,
NULL,
0x80000,
@@ -987,7 +989,7 @@ BOOL daObjFigure_c::createHeap() {
}
}
J3DModelData* pPedestalData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes("Figure", 1));
J3DModelData* pPedestalData = static_cast<J3DModelData*>(dComIfG_getObjectIDRes("Figure", FIGURE_BDL_VF_BS));
if(pPedestalData == NULL) {
return false;
}
@@ -997,7 +999,7 @@ BOOL daObjFigure_c::createHeap() {
return false;
}
mpPedestalBtp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectIDRes("Figure", 2));
mpPedestalBtp = static_cast<J3DAnmTexPattern*>(dComIfG_getObjectIDRes("Figure", FIGURE_BTP_VF_BS));
if(mpPedestalBtp == NULL) {
return false;
}