mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

builds on mac again

Browse Source 
revert some useless ifdefs

rm TARGET_PC in the wrong place

remove stubbed version of functions
This commit is contained in:
Jeffrey Crowell
2026-02-24 16:22:58 -08:00
parent 913d19ed52
commit 9c7f55d1ac
54 changed files with 115 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_bd.cpp
+1 -1
View File
@@ -160,7 +160,7 @@ static void pl_check(bd_class* i_this) {
}
if ((i_this->field_0x618 & 0xF) == 0) {
var_r28 = (u32)fpcM_Search(s_a_sub, a_this);
var_r28 = (u32)(uintptr_t)fpcM_Search(s_a_sub, a_this);
}
if (daPy_getPlayerActorClass()->checkHorseRide()) {
src/d/actor/d_a_e_hm.cpp
+1 -1
View File
@@ -1562,7 +1562,7 @@ int daE_HM_c::Create() {
mAtInfo.mpSound = &mSound;
J3DModel* model = mAnm_p->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) {
if (i != 0) {
src/d/actor/d_a_e_hz.cpp
+1 -1
View File
@@ -1958,7 +1958,7 @@ int daE_HZ_c::CreateHeap() {
}
J3DModel* morfModel = mpMorfSO->getModel();
morfModel->setUserArea((u32)this);
morfModel->setUserArea((uintptr_t)this);
for (u16 i = 0; i < morfModel->getModelData()->getJointNum(); i++) {
if (i != 0) {
morfModel->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
src/d/actor/d_a_e_ww.cpp
+1 -1
View File
@@ -2157,7 +2157,7 @@ int daE_WW_c::CreateHeap() {
}
J3DModel* model = mpModelMorf->getModel();
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (u16 i = JNT_BODY01; i < model->getModelData()->getJointNum(); i++) {
if (i == JNT_NECK || i == JNT_HEAD) {
model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack);
src/d/actor/d_a_mg_fish.cpp
+3 -3
View File
@@ -3649,7 +3649,7 @@ static int useHeapInit2(fopAc_ac_c* i_actor) {
if (i_this->mpModel[0] == 0) {
return 0;
}
i_this->mpModel[0]->setUserArea((s32)i_this);
i_this->mpModel[0]->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < modelData->getJointNum(); i++) {
i_this->mpModel[0]->mModelData->getJointNodePointer(i)->setCallBack(nodeCallBackLH);
}
@@ -3674,7 +3674,7 @@ static int useHeapInit2(fopAc_ac_c* i_actor) {
if (i_this->mpModel[0] == 0) {
return 0;
}
i_this->mpModel[0]->setUserArea((s32)i_this);
i_this->mpModel[0]->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < modelData->getJointNum(); i++) {
i_this->mpModel[0]->mModelData->getJointNodePointer(i)->setCallBack(nodeCallBackBB);
}
@@ -3732,7 +3732,7 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) {
}
J3DModel* model = i_this->mpMorf->getModel();
model->setUserArea((s32)i_this);
model->setUserArea((uintptr_t)i_this);
i_this->mNumJoints = fish_joint[i_this->mGedouKind];
for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) {
model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_movie_player.cpp
+10 -10
View File
@@ -520,7 +520,7 @@ static u8 __THPReadHuffmanTableSpecification() {
u16 length, num_Vij;
__THPHuffmanSizeTab = __THPWorkArea;
__THPHuffmanCodeTab = (u16*)((u32)__THPWorkArea + 256 + 1);
__THPHuffmanCodeTab = (u16*)((uintptr_t)__THPWorkArea + 256 + 1);
length = (u16)((__THPInfo->c)[0] << 8 | (__THPInfo->c)[1]);
__THPInfo->c += 2;
length -= 2;
@@ -618,8 +618,8 @@ static void __THPPrepBitStream() {
u32* ptr;
u32 offset, i, j, k;
ptr = (u32*)((u32)__THPInfo->c & 0xFFFFFFFC);
offset = (u32)__THPInfo->c & 3;
ptr = (u32*)((uintptr_t)__THPInfo->c & 0xFFFFFFFC);
offset = (uintptr_t)__THPInfo->c & 3;
ASSERTLINE(3799, __THPInfo->cnt <= 33);
if (__THPInfo->cnt != 33) {
@@ -1685,7 +1685,7 @@ static void __THPHuffDecodeDCTCompY(__REGISTER THPFileInfo* info, THPCoeff* bloc
_FailedCheckEnoughBits:
cnt += 5;
maxcodebase = (u32) & (h->maxCode);
maxcodebase = (uintptr_t) & (h->maxCode);
// clang-format off
#ifdef __MWERKS__
asm {
@@ -1826,7 +1826,7 @@ static void __THPHuffDecodeDCTCompY(__REGISTER THPFileInfo* info, THPCoeff* bloc
goto _DoneDecodeTab;
_Read4 : {
__REGISTER u32 maxcodebase = (u32) & (h->maxCode);
__REGISTER u32 maxcodebase = (uintptr_t) & (h->maxCode);
__REGISTER u32 tmp2;
// clang-format off
@@ -1862,8 +1862,8 @@ static void __THPHuffDecodeDCTCompY(__REGISTER THPFileInfo* info, THPCoeff* bloc
__REGISTER u32 mask = 0xFFFFFFFF << (33 - cnt);
__REGISTER u32 tmp2;
__REGISTER u32 tmp3;
code = (s32)(cb & (~mask));
mask = (u32) & (h->maxCode);
code = (uintptr_t)(cb & (~mask));
mask = (uintptr_t) & (h->maxCode);
// clang-format off
#ifdef __MWERKS__
@@ -2027,7 +2027,7 @@ _done:
__REGISTER u32 tmp2;
_FailedCheckEnoughBits:
maxcodebase = (u32) & (h->maxCode);
maxcodebase = (uintptr_t) & (h->maxCode);
cnt += 5;
// clang-format off
@@ -2133,7 +2133,7 @@ _FCEB_Done:
return tmp;
_Read4 : {
__REGISTER u32 maxcodebase = (u32) & (h->maxCode);
__REGISTER u32 maxcodebase = (uintptr_t) & (h->maxCode);
__REGISTER u32 tmp2;
// clang-format off
@@ -2218,7 +2218,7 @@ _FailedCheckNoBits1:
__REGISTER u32 tmp2;
code = (s32)(cb & (~mask));
mask = (u32) & (h->maxCode);
mask = (uintptr_t) & (h->maxCode);
// clang-format off
#ifdef __MWERKS__
src/d/actor/d_a_npc_aru.cpp
+1 -1
View File
@@ -474,7 +474,7 @@ int daNpc_Aru_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_henna.cpp
+1 -1
View File
@@ -2615,7 +2615,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModel* morfModel = a_this->mpMorf->getModel();
morfModel->setUserArea((s32)i_this);
morfModel->setUserArea((uintptr_t)i_this);
for (u16 i = 0; i < morfModel->getModelData()->getJointNum(); i++) {
morfModel->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack);
src/d/actor/d_a_npc_hoz.cpp
+1 -1
View File
@@ -498,7 +498,7 @@ int daNpc_Hoz_c::isDelete() {
void daNpc_Hoz_c::reset() {
initialize();
memset(&field_0xfac, 0, (u32)&field_0xfc4 - (u32)&field_0xfac);
memset(&field_0xfac, 0, (uintptr_t)&field_0xfc4 - (uintptr_t)&field_0xfac);
if (mpMatAnm[0] != NULL) {
mpMatAnm[0]->initialize();
src/d/actor/d_a_npc_pachi_besu.cpp
+1 -1
View File
@@ -618,7 +618,7 @@ int daNpc_Pachi_Besu_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_pachi_maro.cpp
+1 -1
View File
@@ -635,7 +635,7 @@ int daNpc_Pachi_Maro_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_pachi_taro.cpp
+1 -1
View File
@@ -859,7 +859,7 @@ int daNpc_Pachi_Taro_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_raca.cpp
+1 -1
View File
@@ -308,7 +308,7 @@ int daNpc_Raca_c::CreateHeap() {
for (u16 i = 0; i < modelData->getJointNum(); i++) {
modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm[0] = new daNpcT_MatAnm_c();
if (mpMatAnm[0] == NULL) {
src/d/actor/d_a_npc_tks.cpp
+2 -2
View File
@@ -384,7 +384,7 @@ int daNpcTks_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
mpMatAnm = new daNpcF_MatAnm_c();
if (mpMatAnm == NULL) {
@@ -488,7 +488,7 @@ void daNpcTks_c::setMtx() {
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(scale);
model->setBaseTRMtx(mDoMtx_stack_c::get());
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
if (mTksTsubo.field_0x586 != 0) {
if (field_0x138a) {
src/d/actor/d_a_npc_zelRo.cpp
+1 -1
View File
@@ -241,7 +241,7 @@ int daNpc_ZelRo_c::CreateHeap() {
for (u16 i = 0; i < mdlData_p->getJointNum(); i++) {
mdlData_p->getJointNodePointer(i)->setCallBack(ctrlJointCallBack);
}
model->setUserArea((u32)this);
model->setUserArea((uintptr_t)this);
for (int i = 0; i < 2; i++) {
mpMatAnm[i] = new daNpcT_MatAnm_c();
src/d/actor/d_a_obj_ornament_cloth.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ int daObjOnCloth_c::createHeap() {
J3DJoint* jointNode_p = mpModel->getModelData()->getJointNodePointer(i);
if (jointNode_p != NULL) {
jointNode_p->setCallBack(nodeCallBack);
mpModel->setUserArea((u32)this);
mpModel->setUserArea((uintptr_t)this);
}
}