JPATexture match

configure.py

@@ -565,7 +565,7 @@ config.libs = [
             Object(NonMatching, "JSystem/JParticle/JPADynamicsBlock.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAFieldBlock.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAKeyBlock.cpp"),
-            Object(NonMatching, "JSystem/JParticle/JPATexture.cpp"),
+            Object(Matching,    "JSystem/JParticle/JPATexture.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAResourceManager.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAEmitterLoader.cpp"),
             Object(NonMatching, "JSystem/JParticle/JPAMath.cpp"),

include/JSystem/JParticle/JPATexture.h

@@ -16,24 +16,23 @@ struct JPATextureData {
 
 class JPATexture {
 public:
-    virtual ~JPATexture();
-    virtual const char* getName() const;
-    virtual void load(GXTexMapID);
-    virtual JUTTexture* getJUTTexture();
-
-    JUTTexture mTexture;
+    virtual ~JPATexture() {}
+    virtual const char* getName() const = 0;
+    virtual void load(GXTexMapID) = 0;
+    virtual JUTTexture* getJUTTexture() = 0;
 };
 
 class JPATextureArc : public JPATexture {
 public:
     JPATextureArc(u8 const*);
-    virtual ~JPATextureArc();
+    virtual ~JPATextureArc() {}
 
-    const char* getName() const { return mpData->mName; }
-    void load(GXTexMapID texMapID) { mTexture.load(texMapID); }
-    JUTTexture* getJUTTexture() { return &mTexture; }
+    virtual const char* getName() const { return mpData->mName; }
+    virtual void load(GXTexMapID texMapID) { mTexture.load(texMapID); }
+    virtual JUTTexture* getJUTTexture() { return &mTexture; }
 
 public:
+    JUTTexture mTexture;
     const JPATextureData* mpData;
 };
 

include/JSystem/JUtility/JUTTexture.h

@@ -41,7 +41,6 @@ public:
     JUTTexture() {
         setCaptureFlag(false);
         mEmbPalette = NULL;
-        mTexInfo = NULL;
     }
 
     JUTTexture(const ResTIMG* p_timg, u8 param_1) {

src/JSystem/JParticle/JPATexture.cpp

@@ -9,7 +9,7 @@
 #include "dolphin/types.h"
 
 /* 80258660-802586D0       .text __ct__13JPATextureArcFPCUc */
-JPATextureArc::JPATextureArc(const unsigned char * pData) {
+JPATextureArc::JPATextureArc(const u8 * pData) {
     mpData = (JPATextureData *) pData;
     mTexture.storeTIMG(&mpData->mResTIMG, (unsigned char)'\0');
 }