Skip to content

Commit d4bb331

Browse files
committed
Fix up some bitmap_z stuff, resourceobject constructor base
1 parent 0798b3c commit d4bb331

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/Engine/includes/Bitmap_Z.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ class Bitmap_Z : public ResourceObject_Z
4949
virtual void Load(void* a1);
5050
virtual void Clean();
5151
void InitBmap(S32 m_SizeX, S32 m_SizeY, U8 m_Format, U8* m_Palette, U8 unkBool);
52-
void EnableFlag(S16 i_Flag) {m_Flag|=i_Flag;}
52+
void EnableFlag(U16 i_Flag) {m_Flag|=i_Flag;}
5353
S32 GetFormat() {return m_Format;}
54+
void* GetDatas() {return m_Datas;}
5455
void Reset();
5556
void Invalidate();
5657
Float GetBytePerPixel();
@@ -69,7 +70,7 @@ class Bitmap_Z : public ResourceObject_Z
6970
U8 m_Transp;
7071
U8 m_MipmapCount;
7172
U8 m_UnkU8_0x31; // Always set to 4
72-
S16 m_Flag;
73+
U16 m_Flag;
7374
};
7475

7576
#endif

src/Engine/includes/ResourceObject_Z.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
class ResourceObject_Z : public BaseObject_Z
66
{
77
public:
8-
ResourceObject_Z();
8+
ResourceObject_Z() {};
99
~ResourceObject_Z();
1010
virtual void Load(void* a1);
1111
virtual void EndLoad();

0 commit comments

Comments
 (0)