JParticle debug (#3090)

1 files changed, 24 insertions, 20 deletions

diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp
index fba6d81ab7..e382a39110 100644
--- a/src/JSystem/JParticle/JPAResourceManager.cpp
+++ b/src/JSystem/JParticle/JPAResourceManager.cpp
@@ -9,37 +9,39 @@ struct JPAResourceLoader {
     JPAResourceLoader(u8 const*, JPAResourceManager*);
 };
 
-JPAResourceManager::JPAResourceManager(void const* pData, JKRHeap* pHeap) {
-    mpResArr = NULL;
-    mpTexArr = NULL;
-    mResMax = 0;
-    mResNum = 0;
-    mTexMax = 0;
-    mTexNum = 0;
+JPAResourceManager::JPAResourceManager(void const* p_jpc, JKRHeap* pHeap) {
+    pResAry = NULL;
+    pTexAry = NULL;
+    resMaxNum = 0;
+    resRegNum = 0;
+    texMaxNum = 0;
+    texRegNum = 0;
     mpHeap = pHeap;
-    JPAResourceLoader loader((u8 const*)pData, this);
+    JUT_ASSERT(49, (p_jpc != 0) && (pHeap != 0));
+    JPAResourceLoader loader((u8 const*)p_jpc, this);
 }
 
 JPAResource* JPAResourceManager::getResource(u16 usrIdx) const {
-    for (u16 i = 0; i < mResNum; i++)
-        if (mpResArr[i]->getUsrIdx() == usrIdx)
-            return mpResArr[i];
+    for (u16 i = 0; i < resRegNum; i++)
+        if (pResAry[i]->getUsrIdx() == usrIdx)
+            return pResAry[i];
     return NULL;
 }
 
 bool JPAResourceManager::checkUserIndexDuplication(u16 usrIdx) const {
-    for (s32 i = 0; i < mResNum; i++)
-        if (mpResArr[i]->getUsrIdx() == usrIdx)
+    for (s32 i = 0; i < resRegNum; i++)
+        if (pResAry[i]->getUsrIdx() == usrIdx)
             return true;
     return false;
 }
 
 const ResTIMG* JPAResourceManager::swapTexture(ResTIMG const* img, char const* swapName) {
     const ResTIMG* ret = NULL;
+    JUTTexture* tex = NULL;
 
-    for (s32 i = 0; i < mTexNum; i++) {
-        if (strcmp(swapName, mpTexArr[i]->getName()) == 0) {
-            JUTTexture* tex = mpTexArr[i]->getJUTTexture();
+    for (s32 i = 0; i < texRegNum; i++) {
+        if (strcmp(swapName, pTexAry[i]->getName()) == 0) {
+            tex = pTexAry[i]->getJUTTexture();
             ret = tex->getTexInfo();
             tex->storeTIMG(img, (u8)0);
             break;
@@ -50,13 +52,15 @@ const ResTIMG* JPAResourceManager::swapTexture(ResTIMG const* img, char const* s
 }
 
 void JPAResourceManager::registRes(JPAResource* res) {
-    mpResArr[mResNum] = res;
-    mResNum++;
+    JUT_ASSERT(151, resRegNum < resMaxNum);
+    pResAry[resRegNum] = res;
+    resRegNum++;
 }
 
 void JPAResourceManager::registTex(JPATexture* tex) {
-    mpTexArr[mTexNum] = tex;
-    mTexNum++;
+    JUT_ASSERT(166, texRegNum < texMaxNum);
+    pTexAry[texRegNum] = tex;
+    texRegNum++;
 }
 
 u32 JPAResourceManager::getResUserWork(u16 usrIdx) const {