snd_FrameHeap OK

1 files changed, 7 insertions, 10 deletions

diff --git a/include/nw4r/snd/snd_FrameHeap.h b/include/nw4r/snd/snd_FrameHeap.h
index 3fe9d628..86b4b3ed 100644
--- a/include/nw4r/snd/snd_FrameHeap.h
+++ b/include/nw4r/snd/snd_FrameHeap.h
@@ -34,22 +34,19 @@ public:
 private:
     struct Block {
         NW4R_UT_LIST_NODE_DECL(); // at 0x0
-        u32 mSize;                // at 0x8
-        FreeCallback mCallback;   // at 0xc
-        void *mCallbackArg;       // at 0x10
+        void *mpBuffer;           // at 0x8
+        u32 mSize;                // at 0xC
+        FreeCallback mCallback;   // at 0x10
+        void *mCallbackArg;       // at 0x14
 
-        Block(u32 size, FreeCallback pCallback, void *pCallbackArg)
-            : mSize(size), mCallback(pCallback), mCallbackArg(pCallbackArg) {}
+        Block(void *pBuffer2, u32 size, FreeCallback pCallback, void *pCallbackArg)
+            : mSize(size), mCallback(pCallback), mCallbackArg(pCallbackArg), mpBuffer(pBuffer2) {}
 
         ~Block() {
             if (mCallback != NULL) {
-                mCallback(GetBufferAddr(), mSize, mCallbackArg);
+                mCallback(mpBuffer, mSize, mCallbackArg);
             }
         }
-
-        void *GetBufferAddr() {
-            return ut::AddOffsetToPtr(this, BLOCK_BUFFER_SIZE);
-        }
     };
 
     NW4R_UT_LIST_TYPEDEF_DECL(Block);