From cbf274ce1d6c36c1f62610febcccac19cafa8331 Mon Sep 17 00:00:00 2001 From: HeartPiece Date: Wed, 28 Feb 2024 11:19:39 +1100 Subject: [PATCH] Make all source files compilable --- docs/recommended_todo.md | 22 ++++++++--------- include/JSystem/J3D/J3DMtxCalc.h | 2 +- include/JSystem/JAudio/JAD/JADDataMgr.h | 4 ++-- src/JSystem/J3D/J3DJoint.cpp | 8 +++---- src/JSystem/JStudio/jstudio-control.cpp | 2 +- .../JStudio_JParticle/object-particle.cpp | 4 ++-- src/plugProjectEbisawaU/efxBase.cpp | 6 ++--- .../baseGameSectionKantei.cpp | 2 +- src/plugProjectKandoU/itemUjamushi.cpp | 4 ++-- src/plugProjectKandoU/itemWeed.cpp | 2 +- src/plugProjectKandoU/pelletMgr.cpp | 24 +++++++++---------- src/sysGCU/JSTObjectActor.cpp | 4 ++-- src/sysGCU/JSTObjectParticleActor.cpp | 16 ++++++------- src/sysGCU/graphics.cpp | 8 +++---- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/docs/recommended_todo.md b/docs/recommended_todo.md index 95cf01825..51e1b4c91 100644 --- a/docs/recommended_todo.md +++ b/docs/recommended_todo.md @@ -28,19 +28,19 @@ | JGadget/std-list.cpp | 6333 | JMessage/control.cpp | 6416 | | J3D/J3DJointTree.cpp | 6840 | JStudio/jstudio-math.cpp | 8130 | | J2D/J2DTevs.cpp | 8222 | JParticle/JPAResourceLoader.cpp | 9869 | -| JAudio//JAI/JAISequenceHeap.cpp | 9983 | JAudio//JAI/JAIInitData.cpp | 10202 | -| JStudio/jstudio-control.cpp | 10213 | JParticle/JPAMath.cpp | 10306 | +| JAudio//JAI/JAISequenceHeap.cpp | 9983 | JStudio/jstudio-control.cpp | 10198 | +| JAudio//JAI/JAIInitData.cpp | 10202 | JParticle/JPAMath.cpp | 10306 | | JParticle/JPAEmitterManager.cpp | 10538 | JAudio//JAI/JAIObject.cpp | 11254 | | JStudio_JStage/object-light.cpp | 11408 | JAudio//JAS/JASDSPChannel.cpp | 12076 | | JAudio//JAS/JASWSParser.cpp | 12435 | JAudio//JAS/JASTaskThread.cpp | 12843 | | JAudio//JAS/JASAiCtrl.cpp | 14267 | JGadget/std-vector.cpp | 15911 | | J3D/J3DTransform.cpp | 16131 | JStudio/stb.cpp | 16172 | -| JStudio_JParticle/object-particle.cpp | 16654 | JStudio_JStage/object-camera.cpp | 17755 | +| JStudio_JParticle/object-particle.cpp | 16698 | JStudio_JStage/object-camera.cpp | 17755 | | J3D/J3DCluster.cpp | 18124 | JAudio//JAI/JAISystemInterface.cpp | 19058 | | J3D/J3DShape.cpp | 19462 | JStudio_JAudio/object-sound.cpp | 20083 | | JMessage/resource.cpp | 20331 | JAudio//JAS/JASBNKParser.cpp | 20964 | | J3D/J3DModelLoaderCalcSize.cpp | 21199 | JAudio//JAI/JAIAnimation.cpp | 21573 | -| J2D/J2DWindow.cpp | 22771 | J3D/J3DJoint.cpp | 23493 | +| J2D/J2DWindow.cpp | 22771 | J3D/J3DJoint.cpp | 23549 | | J2D/J2DMaterial.cpp | 23586 | JKernel/JKRHeap.cpp | 23801 | | J3D/J3DMtxBuffer.cpp | 23904 | JParticle/JPADynamicsBlock.cpp | 24323 | | J2D/J2DTextBoxEx.cpp | 24399 | J3D/J3DGD.cpp | 26174 | @@ -69,7 +69,7 @@ | efx2dEffect.cpp | 10340 | ebi2DCallBack.cpp | 10457 | | efxObject.cpp | 11240 | particleMgr.cpp | 12851 | | ebiP2Title.cpp | 23731 | efxPikmin.cpp | 33209 | -| efxBase.cpp | 35283 | efxEnemy.cpp | 39166 | +| efxBase.cpp | 35235 | efxEnemy.cpp | 39166 | | ebiScreenMemoryCard.cpp | 48588 | | | ###
plugProjectHikinoU
@@ -99,11 +99,11 @@ | mapMgr.cpp | 43345 | collinfo.cpp | 43410 | | pikiMgr.cpp | 47880 | aiFormation.cpp | 52263 | | cellPyramid.cpp | 52507 | navi_demoCheck.cpp | 57448 | -| itemWeed.cpp | 62050 | pelletState.cpp | 62915 | -| itemUjamushi.cpp | 63532 | singleGS_CaveGame.cpp | 64772 | +| itemWeed.cpp | 62058 | pelletState.cpp | 62915 | +| itemUjamushi.cpp | 63548 | singleGS_CaveGame.cpp | 64772 | | fakePiki.cpp | 65612 | gamePlayData.cpp | 66045 | | itemPlant.cpp | 73150 | baseGameSection.cpp | 91018 | -| aiPrimitives.cpp | 116997 | pelletMgr.cpp | 142649 | +| aiPrimitives.cpp | 116997 | pelletMgr.cpp | 142637 | | navi.cpp | 150933 | pikiState.cpp | 153107 | | singleGS_Zukan.cpp | 161306 | gameMapParts.cpp | 168069 | | naviState.cpp | 180513 | | | @@ -197,16 +197,16 @@ | captionMessage.cpp | 4025 | aramMgr.cpp | 4257 | | messageMgr.cpp | 6794 | section.cpp | 8000 | | JSTObjectCamera.cpp | 8577 | JSTObjectGameActor.cpp | 9261 | -| loadResource.cpp | 9618 | JSTObjectParticleActor.cpp | 10416 | +| loadResource.cpp | 9618 | JSTObjectParticleActor.cpp | 10461 | | heapStatus.cpp | 12534 | sysMaterialAnim.cpp | 13325 | | sysShape.cpp | 15109 | sysShapeModel.cpp | 16166 | | JSTObjectSystem.cpp | 17997 | titleSection.cpp | 19575 | -| JSTObjectActor.cpp | 19715 | resourceMgr.cpp | 21536 | +| JSTObjectActor.cpp | 19718 | resourceMgr.cpp | 21536 | | matMath.cpp | 26224 | moviePlayer.cpp | 30654 | | windowMessage.cpp | 37914 | bootSection.cpp | 38174 | | system.cpp | 38660 | movieMessage.cpp | 48193 | | memoryCard.cpp | 48550 | screenMgr.cpp | 50710 | -| pikmin2MemoryCardMgr.cpp | 50817 | graphics.cpp | 76087 | +| pikmin2MemoryCardMgr.cpp | 50817 | graphics.cpp | 76095 | | messageRendering.cpp | 108929 | | | ###
utilityU
diff --git a/include/JSystem/J3D/J3DMtxCalc.h b/include/JSystem/J3D/J3DMtxCalc.h index feb4b0751..bbe4ff78d 100644 --- a/include/JSystem/J3D/J3DMtxCalc.h +++ b/include/JSystem/J3D/J3DMtxCalc.h @@ -75,7 +75,7 @@ struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase { } virtual ~J3DMtxCalcAnimation() {}; // _08 - virtual void setAnmTransform(J3DAnmTransform* p1) { mAnim = p1; } // _0C + virtual void setAnmTransform(J3DAnmTransform* p1) { mBaseAnim = p1; } // _0C virtual void init(const Vec& p1, const f32 (&p2)[3][4]) { Init::init(p1, p2); } // _24 virtual void calc() // _28 { diff --git a/include/JSystem/JAudio/JAD/JADDataMgr.h b/include/JSystem/JAudio/JAD/JADDataMgr.h index a5592e3d8..dcac846ce 100644 --- a/include/JSystem/JAudio/JAD/JADDataMgr.h +++ b/include/JSystem/JAudio/JAD/JADDataMgr.h @@ -125,8 +125,8 @@ struct PrmDataMgrNode : public DataMgrNode { virtual bool initInstance(void* buffer, s32 bufferLength) { if (initInstance()) { - JSUMemoryInputStream input; - input.setBuffer(buffer, bufferLength); + JSUMemoryInputStream input(buffer, bufferLength); + // input.setBuffer(buffer, bufferLength); mPrmSetRc->load(input); return true; } diff --git a/src/JSystem/J3D/J3DJoint.cpp b/src/JSystem/J3D/J3DJoint.cpp index 4ecf28928..ec33563ab 100644 --- a/src/JSystem/J3D/J3DJoint.cpp +++ b/src/JSystem/J3D/J3DJoint.cpp @@ -702,10 +702,10 @@ J3DJoint::J3DJoint() mMtxCalc = nullptr; mMaterial = nullptr; - Vec init = { 0.0f, 0.0f, 0.0f }; - mMin = init; - Vec init2 = { 0.0f, 0.0f, 0.0f }; - mMax = init2; + JGeometry::TVec3f init = { 0.0f, 0.0f, 0.0f }; + mMin = init; + JGeometry::TVec3f init2 = { 0.0f, 0.0f, 0.0f }; + mMax = init2; } /** diff --git a/src/JSystem/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/jstudio-control.cpp index 2f5451ace..bcb056844 100644 --- a/src/JSystem/JStudio/jstudio-control.cpp +++ b/src/JSystem/JStudio/jstudio-control.cpp @@ -73,7 +73,7 @@ TControl::TControl() , _74(0) , _75(0) { - Vec vec = JGeometry::TVec3f(0.0f, 0.0f, 0.0f); + Vec vec = { 0.0f, 0.0f, 0.0f }; transformOnSet_setOrigin(vec, 0.0f); transformOnGet_setOrigin(vec, 0.0f); /* diff --git a/src/JSystem/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio_JParticle/object-particle.cpp index e7463fe6e..20fa3eff2 100644 --- a/src/JSystem/JStudio_JParticle/object-particle.cpp +++ b/src/JSystem/JStudio_JParticle/object-particle.cpp @@ -265,10 +265,10 @@ void JStudio_JParticle::TAdaptor_particle::TJPACallback_::execute(JPABaseEmitter outVec[1].z = srts[1].z; pos = outVec; } - emitter->mGlobalTrs = pos[0]; + emitter->mGlobalTrs = ((JGeometry::TVec3f*)pos)[0]; JPAGetXYZRotateMtx(65536.0 * (pos[1].x / 360.0), 65536.0 * (pos[1].y / 360.0), 65536.0 * (pos[1].z / 360.0), emitter->mGlobalRot); - JGeometry::TVec3f scaleVec(pos[2]); + JGeometry::TVec3f scaleVec(((JGeometry::TVec3f*)pos)[2]); emitter->setScale(scaleVec); } else { Mtx mtx; diff --git a/src/plugProjectEbisawaU/efxBase.cpp b/src/plugProjectEbisawaU/efxBase.cpp index 34f9bb645..c521f72a1 100644 --- a/src/plugProjectEbisawaU/efxBase.cpp +++ b/src/plugProjectEbisawaU/efxBase.cpp @@ -60,7 +60,7 @@ void TOneEmitter::executeAfter(JPABaseEmitter* emitter) for (int i = 0; i < createCount; i++) { JPABaseParticle* particle = emitter->createParticle(); if (particle) { - particle->mOffsetPosition = JGeometry::TVec3f(v1.x, v1.y, v1.z); + particle->mOffsetPosition.set(v1.x, v1.y, v1.z); } } } @@ -166,7 +166,7 @@ void TOneEmitterChasePos::executeAfter(JPABaseEmitter* emitter) for (int i = 0; i < createCount; i++) { JPABaseParticle* particle = emitter->createParticle(); if (particle) { - particle->mOffsetPosition = JGeometry::TVec3f(v1->x, v1->y, v1->z); + particle->mOffsetPosition.set(v1->x, v1->y, v1->z); } } } @@ -238,7 +238,7 @@ void TOneEmitterSimple::executeAfter(JPABaseEmitter* emitter) for (int i = 0; i < createCount; i++) { JPABaseParticle* particle = emitter->createParticle(); if (particle) { - particle->mOffsetPosition = JGeometry::TVec3f(v1.x, v1.y, v1.z); + particle->mOffsetPosition.set(v1.x, v1.y, v1.z); } } } diff --git a/src/plugProjectKandoU/baseGameSectionKantei.cpp b/src/plugProjectKandoU/baseGameSectionKantei.cpp index 636503bb5..d91791e16 100644 --- a/src/plugProjectKandoU/baseGameSectionKantei.cpp +++ b/src/plugProjectKandoU/baseGameSectionKantei.cpp @@ -466,7 +466,7 @@ lbl_8023BEBC: * @note Address: 0x8023BEF4 * @note Size: 0x164 */ -bool BaseGameSection::ZoomCamera::doUpdate() +void BaseGameSection::ZoomCamera::doUpdate() { bool check1 = false; // r4 bool check2 = false; // r5 diff --git a/src/plugProjectKandoU/itemUjamushi.cpp b/src/plugProjectKandoU/itemUjamushi.cpp index e9617455a..3c5dcffed 100644 --- a/src/plugProjectKandoU/itemUjamushi.cpp +++ b/src/plugProjectKandoU/itemUjamushi.cpp @@ -2453,12 +2453,12 @@ Mgr::Mgr() _30C = 0.0f; J3DModelData* polyData = getModelData(0); polyData->newSharedDisplayList(0x40000); - polyData->simpleCalcMaterial(0, j3dDefaultMtx); + polyData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx); polyData->makeSharedDL(); J3DModelData* billData = getModelData(1); billData->newSharedDisplayList(0x40000); - billData->simpleCalcMaterial(0, j3dDefaultMtx); + billData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx); billData->makeSharedDL(); _88 = 72.0f; diff --git a/src/plugProjectKandoU/itemWeed.cpp b/src/plugProjectKandoU/itemWeed.cpp index 221b6fd5b..7a5c29794 100644 --- a/src/plugProjectKandoU/itemWeed.cpp +++ b/src/plugProjectKandoU/itemWeed.cpp @@ -456,7 +456,7 @@ Mgr::Mgr() for (int i = 0; i < 4; i++) { J3DModelData* modelData = getModelData(i); modelData->newSharedDisplayList(0x40000); - modelData->simpleCalcMaterial(0, j3dDefaultMtx); + modelData->simpleCalcMaterial(0, *(Mtx*)&j3dDefaultMtx); modelData->makeSharedDL(); } } diff --git a/src/plugProjectKandoU/pelletMgr.cpp b/src/plugProjectKandoU/pelletMgr.cpp index f8356b34d..162020476 100644 --- a/src/plugProjectKandoU/pelletMgr.cpp +++ b/src/plugProjectKandoU/pelletMgr.cpp @@ -5531,14 +5531,14 @@ Pellet* PelletMgr::birth(PelletInitArg* arg) if (strcmp("yes", config->mParams.mUnique.mData) == 0) { int unk = arg->mPelletIndex; if (arg->mPelletType == PelletList::OTAKARA) { - u8* result = playData->mZukanStat->mOtakara(unk); - if (*result & 2) { + u8 result = playData->mZukanStat->mOtakara(unk); + if (result & 2) { mgr->mConfigList->getPelletConfig(arg->mTextIdentifier); return nullptr; } } else if (arg->mPelletType == PelletList::ITEM) { - u8* result = playData->mZukanStat->mItem(unk); - if (*result & 2) { + u8 result = playData->mZukanStat->mItem(unk); + if (result & 2) { mgr->mConfigList->getPelletConfig(arg->mTextIdentifier); return nullptr; } @@ -5585,14 +5585,14 @@ bool PelletMgr::setUse(PelletInitArg* arg) if (strcmp("yes", config->mParams.mUnique.mData) == 0) { int unk = arg->mPelletIndex; if (arg->mPelletType == PelletList::OTAKARA) { - u8* result = playData->mZukanStat->mOtakara(unk); - if (*result & 2) { + u8 result = playData->mZukanStat->mOtakara(unk); + if (result & 2) { mgr->mConfigList->getPelletConfig(arg->mTextIdentifier); return false; } } else if (arg->mPelletType == PelletList::ITEM) { - u8* result = playData->mZukanStat->mItem(unk); - if (*result & 2) { + u8 result = playData->mZukanStat->mItem(unk); + if (result & 2) { mgr->mConfigList->getPelletConfig(arg->mTextIdentifier); return false; } @@ -5640,13 +5640,13 @@ bool PelletMgr::OtakaraItemCode::isNull() if (strcmp("yes", config->mParams.mUnique.mData) == 0) { u8 code = mValue; if ((u8)(mValue >> 8) == 3) { - u8* result = playData->mZukanStat->mOtakara(code); - if (*result & 2) { + u8 result = playData->mZukanStat->mOtakara(code); + if (result & 2) { return true; } } else { - u8* result = playData->mZukanStat->mItem(code); - if (*result & 2) { + u8 result = playData->mZukanStat->mItem(code); + if (result & 2) { return true; } } diff --git a/src/sysGCU/JSTObjectActor.cpp b/src/sysGCU/JSTObjectActor.cpp index 3aa4f1243..8fe69491f 100644 --- a/src/sysGCU/JSTObjectActor.cpp +++ b/src/sysGCU/JSTObjectActor.cpp @@ -523,10 +523,10 @@ void ObjectActor::parseUserData_(u32 p1, void const* p2) JStudio::stb::data::TParse_TParagraph_data v1(p2); JStudio::stb::data::TParse_TParagraph_data::TData v2; v1.getData(&v2); - if (v2.status == 0) { + if (v2.mStatus == 0) { return; } - if (v2.fileCount == 0 || v2.status != 0x22 || v2._10 == nullptr) { + if (v2.mFileCount == 0 || v2.mStatus != 0x22 || v2._10 == nullptr) { return; } diff --git a/src/sysGCU/JSTObjectParticleActor.cpp b/src/sysGCU/JSTObjectParticleActor.cpp index 5589d846d..f9ecfd4c8 100644 --- a/src/sysGCU/JSTObjectParticleActor.cpp +++ b/src/sysGCU/JSTObjectParticleActor.cpp @@ -210,26 +210,26 @@ void ObjectParticleActor::parseUserData_(u32 p1, void const* rawData) JStudio::stb::data::TParse_TParagraph_data paragraph(rawData); JStudio::stb::data::TParse_TParagraph_data::TData data; paragraph.getData(&data); - if (data.status == 0) { + if (data.mStatus == 0) { return; } - if (data.fileCount == 0 || data.status != 0x60) { + if (data.mFileCount == 0 || data.mStatus != 0x60) { return; } mModelJointIndex = -1; for (int i = 0; i < data._08; i++) { - OSReport("string:%u,%s\n", i, data.fileCount); + OSReport("string:%u,%s\n", i, data.mFileCount); if (i == 0) { - if (strcmp(data.fileCount, "kill") == 0) { + if (strcmp((char*)data.mFileCount, "kill") == 0) { mEfxFlag |= 2; } else { - mGameObject = mMoviePlayer->mObjectSystem->findCreature(data.fileCount); + mGameObject = mMoviePlayer->mObjectSystem->findCreature((char*)data.mFileCount); } } else if (i == 1) { - if (strcmp(data.fileCount, "@ground") == 0) { + if (strcmp((char*)data.mFileCount, "@ground") == 0) { mModelJointIndex = -2; } else if (mGameObject != nullptr && mGameObject->mModel != nullptr) { - SysShape::Joint* joint = mGameObject->mModel->getJoint(data.fileCount); + SysShape::Joint* joint = mGameObject->mModel->getJoint((char*)data.mFileCount); if (joint != nullptr) { mModelJointIndex = joint->mJointIndex; } else { @@ -237,7 +237,7 @@ void ObjectParticleActor::parseUserData_(u32 p1, void const* rawData) } } } - data.fileCount = strchr(data.fileCount, 0) + 1; + data.mFileCount = strchr((char*)data.mFileCount, 0) + 1; } /* stwu r1, -0x30(r1) diff --git a/src/sysGCU/graphics.cpp b/src/sysGCU/graphics.cpp index b9d970fef..a9f7b8dac 100644 --- a/src/sysGCU/graphics.cpp +++ b/src/sysGCU/graphics.cpp @@ -1927,11 +1927,11 @@ void Graphics::drawTile(Sys::Sphere&, Sys::Sphere&, JUTTexture*) * @note Address: 0x80426CB8 * @note Size: 0x70C */ -void Graphics::drawCone(Vector3f& start, Vector3f& end, f32 angle, int limit) +void Graphics::drawCone(Vector3f& start, Vector3f& end, f32 inAngle, int limit) { - f32 angle = TORADIANS(angle); // f7 - Vector3f sep = end - start; // f2, f0, f1 - f32 dist = sep.length(); // f31 + f32 angle = TORADIANS(inAngle); // f7 + Vector3f sep = end - start; // f2, f0, f1 + f32 dist = sep.length(); // f31 f32 sinTheta = sinf(angle); f32 cosTheta = cosf(angle);