diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 8fb43249f..629b01d46 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -285,7 +285,7 @@ public: mFrameMax = i_frameMax; } - virtual ~J3DAnmBase(); + virtual ~J3DAnmBase() {} u8 getAttribute() const { return mAttribute; } s16 getFrameMax() const { return mFrameMax; } @@ -308,7 +308,7 @@ public: field_0xc = p1; } - virtual ~J3DAnmTransform(); + virtual ~J3DAnmTransform() {} virtual void getTransform(u16, J3DTransformInfo*) const = 0; private: diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index b77aea2f5..6e16be167 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -216,7 +216,7 @@ private: class mDoExt_transAnmBas : public J3DAnmTransformKey { public: mDoExt_transAnmBas(void* bas) { mBas = bas; } - virtual ~mDoExt_transAnmBas(); + virtual ~mDoExt_transAnmBas() {} void* getBas() { return mBas; } diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 8f2d68922..12870303a 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -142,7 +142,7 @@ static void setToonTex(J3DMaterialTable* pMaterialTable) { /* 8006DFD4-8006E7A4 .text loadResource__11dRes_info_cFv */ int dRes_info_c::loadResource() { - JUT_ASSERT(0x254, mRes == 0); + JUT_ASSERT(0x25f, mRes == 0); s32 fileNum = mpArchive->countFile(); mRes = new void*[fileNum]; @@ -195,7 +195,7 @@ int dRes_info_c::loadResource() { void * pRes = JKRArchive::getGlbResource(*pResType, pArcFinder->mEntryName, mpArchive); if (pRes == NULL) { OSReport_Error("<%s> res == NULL !!\n", pArcFinder->mEntryName); - continue; + goto next; } u32 resType = *pResType; @@ -275,7 +275,7 @@ int dRes_info_c::loadResource() { if (pRes == NULL) return -1; } else if (resType == 'BDLM') { - pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00001020); + pRes = J3DModelLoaderDataBase::loadBinaryDisplayList(pRes, 0x00002020); if (pRes == NULL) return -1; @@ -363,6 +363,7 @@ int dRes_info_c::loadResource() { pRes = cBgS::ConvDzb(pRes); } +next: mRes[pArcFinder->mEntryFileIndex] = pRes; } @@ -473,7 +474,9 @@ static SArcHeader* getArcHeader(JKRArchive* pArchive) { return NULL; } -static const char * dump_str = "%5.1f %5x %5.1f %5x %3d %s\n"; +static void dummy() { + OSReport("%5.1f %5x %5.1f %5x %3d %s\n"); +} /* 8006EBF8-8006ECF4 .text dump_long__11dRes_info_cFP11dRes_info_ci */ void dRes_info_c::dump_long(dRes_info_c* pRes, int num) {