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

Remove some unnecessary version ifdefs

Browse Source
This commit is contained in:
LagoLunatic
2026-03-31 22:27:13 -04:00
parent 207f6e911f
commit a4de4f08fb
6 changed files with 23 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ssk.cpp
+9 -12
View File
@@ -280,15 +280,16 @@ static BOOL useHeapInit(fopAc_ac_c* a_this) {
return FALSE;
}
#if VERSION == VERSION_DEMO
i_this->mpMorf2 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Ssk", SSK_BDL_KTANA_00), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0x0, 0x11020203
(J3DModelData*)dComIfG_getObjectRes("Ssk", SSK_BDL_KTANA_00),
NULL, NULL, NULL,
DEMO_SELECT(J3DFrameCtrl::EMode_LOOP, J3DFrameCtrl::EMode_NULL),
1.0f, 0, -1,
DEMO_SELECT(0, 1),
NULL,
DEMO_SELECT(0x0, 0x80000),
DEMO_SELECT(0x11020203, 0x11000022)
);
#else
i_this->mpMorf2 = new mDoExt_McaMorf(
(J3DModelData*)dComIfG_getObjectRes("Ssk", SSK_BDL_KTANA_00), NULL, NULL, NULL, ~J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000022
);
#endif
if (i_this->mpMorf2 == NULL || i_this->mpMorf2->getModel() == NULL) {
return FALSE;
}
@@ -391,11 +392,7 @@ static cPhs_State daSsk_Create(fopAc_ac_c* a_this) {
i_this->m2C0 = 400.0f;
}
#if VERSION == VERSION_DEMO
u32 heapSize = 0x13C0;
#else
u32 heapSize = 0x1300;
#endif
u32 heapSize = DEMO_SELECT(0x13C0, 0x1300);
if (!fopAcM_entrySolidHeap(a_this, useHeapInit, heapSize)) {
return cPhs_ERROR_e;
}