Bitmap_Z work, fill ResourceObject_Z with actual information

Author: SamuraiOndo

configure.py

@@ -218,22 +218,6 @@
     "-rostr"
 ]
 
-cflags_rat_base_libgc = [
-    *cflags_base,
-    "-pool on",
-    "-schedule on",
-    "-fp fmadd",
-    "-use_lmw_stmw on",
-    '-pragma "cpp_extensions on"',
-    "-sym on",
-    "-inline off",
-    "-i src/Engine/includes",
-    "-i src/LibGC/includes",
-    "-i src/Rat/includes",
-    "-i src/sdk/includes",
-    "-O4,p",
-    "-rostr"
-]
 
 cflags_rat_base_libgc = [
     *cflags_base,

src/Engine/Bitmap_Z.cpp

@@ -2,6 +2,7 @@
 #include "Assert_Z.h"
 extern void Z_FreeContiguous(void* ptr);
 
+#pragma dont_inline on
 Bitmap_Z::Bitmap_Z()
 {
     Init();
@@ -18,7 +19,6 @@ Bitmap_Z::~Bitmap_Z()
     Reset();
 }
 
-#pragma dont_inline on
 void Bitmap_Z::Init() {
     m_Flag = 0;
     Bitmap_Z::EnableFlag(0x14);
@@ -54,7 +54,7 @@ void Bitmap_Z::Reset() {
 }
 
 // far from complete
-void Bitmap_Z::InitBmap(S32 i_SizeX, S32 i_SizeY, U8 i_Format, U8* i_Palette, U8 i_UnkBool)
+void Bitmap_Z::InitBmap(S32 i_SizeX, S32 i_SizeY, U8 i_Format, U8* i_Palette, U8* i_Datas)
 {
     int l_PaletteSize;
     int l_BytePalleteSize;
@@ -121,20 +121,36 @@ S32 Bitmap_Z::GetDataSize()
     return l_MipSize;
 }
 
-// not matching. too lazy to fix for now
 S32 Bitmap_Z::GetPalSize()
 {
-    U8 l_PalFormat = m_PalFormat;
-    if ((l_PalFormat >= PAL_ALPHA|PAL_565) && (l_PalFormat != 9 && l_PalFormat < 0x10))
-        return 0;
-    else
+    switch (GetFormat())
     {
-        if (l_PalFormat == PAL_565)
-            return 256;
-        else if (l_PalFormat == PAL_3444)
+        case BM_4:
             return 16;
+        case BM_8:
+            return 256;
+        case BM_5551:
+        case BM_565:
+        case BM_4444:
+        case BM_1555:
+        case BM_8888:
+        case BM_888:
+        case BM_CMPR:
+        case BM_I4A4:
+            return 0;
+        default:
+            ExceptionFonc_Z("FALSE", __FILE__, __LINE__, "Bitmap_Z::GetPalSize", 0, 0, 0, 0, 0, 0);
+            return 0;
+        
     }
-    ExceptionFonc_Z("FALSE", __FILE__, __LINE__, "Bitmap_Z::GetPalSize", 0, 0, 0, 0, 0, 0);
-    return 0;
+}
+
+S32 Bitmap_Z::GetNbEntries()
+{
+    U8 l_Format = m_Format;
+    if (l_Format == BM_4)
+        return 16;
+    else
+        return l_Format != BM_8 ? 256 : 0;
 }
 #pragma dont_inline off

src/Engine/includes/Bitmap_Z.h

@@ -50,15 +50,16 @@ class Bitmap_Z : public ResourceObject_Z
     virtual ~Bitmap_Z();
     virtual void Load(void* a1);
     virtual void Clean();
-    void InitBmap(S32 l_SizeX, S32 l_SizeY, U8 l_Format, U8* l_Palette, U8 l_UnkBool);
+    void InitBmap(S32 l_SizeX, S32 l_SizeY, U8 l_Format, U8* l_Palette, U8* i_Datas);
     void EnableFlag(U16 i_Flag)   {m_Flag|=i_Flag;}
-    S32 GetFormat() {return m_Format;}
+    U8 GetFormat() {return m_Format;}
     void* GetDatas() {return m_Datas;}
     void Reset();
     void Invalidate();
     Float GetBytePerPixel();
     S32 GetPalSize();
     S32 GetDataSize();
+    S32 GetNbEntries();
 private:
     void* m_Datas;
     void* m_Palette;

src/Engine/includes/ResourceObject_Z.h

@@ -1,18 +1,30 @@
 #ifndef _RESOURCE_OBJECT_Z_H_
 #define _RESOURCE_OBJECT_Z_H_
 #include "BaseObject_Z.h"
+#include "DynArray_Z.h"
+class ResourceObjectLink_Z
+{
+    public:
+        ResourceObjectLink_Z();
+        ~ResourceObjectLink_Z();
+        void Load(void* a1);
+        void EndLoad();
+        void EndLoadLinks();
+        void MarkHandles();
+        DynArray_Z<BaseObject_ZHdl, 32> m_LinkedResourceDA;
+};
 
 class ResourceObject_Z : public BaseObject_Z
 {
     public:
-        ResourceObject_Z() {};
+        ResourceObject_Z();
         ~ResourceObject_Z();
         virtual void Load(void* a1);
         virtual void EndLoad();
         virtual void LoadLinks(void* a1);
         virtual void EndLoadLinks();
         virtual void MarkHandles();
-    	char pad_000C[8];
+    	ResourceObjectLink_Z m_ResObjLink;
 };
 
 #endif