Merge branch 'master' into implemement-BoundingVolume0x64

foxtacles · web-flow · commit afa839d5ebc7 · 2026-05-15T18:50:04.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,7 +161,7 @@ add_library(goldp SHARED
   GolDP/src/goldrawdpstate.cpp
   GolDP/src/goldpexport.cpp
   GolDP/src/fluffygloomkins0x118.cpp
-  GolDP/src/pearldew0x0c.cpp
+  GolDP/src/directdrawpalette.cpp
   GolDP/src/goldevicelist.cpp
   GolDP/src/main.cpp
   GolDP/src/zoweeblubberworth0xf0.cpp
diff --git a/GolDP/include/bronzefalcon0xc8770.h b/GolDP/include/bronzefalcon0xc8770.h
@@ -175,7 +175,7 @@ class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
 	// SYNTHETIC: GOLDP 0x10007960
 	// BronzeFalcon0xc8770::`scalar deleting destructor'
 
-	friend class PearlDew0x0c;
+	friend class DirectDrawPalette;
 	friend class SlatePeak0x58;
 	friend class BronzeFalconSurface0x5c;
 
diff --git a/GolDP/include/directdrawpalette.h b/GolDP/include/directdrawpalette.h
@@ -1,5 +1,5 @@
-#ifndef GOLDP_PEARLDEW0X0C_H
-#define GOLDP_PEARLDEW0X0C_H
+#ifndef GOLDP_DIRECTDRAWPALETTE_H
+#define GOLDP_DIRECTDRAWPALETTE_H
 
 #include "compat.h"
 #include "decomp.h"
@@ -10,7 +10,7 @@
 
 // VTABLE: GOLDP 0x10056520
 // SIZE 0x0c
-class PearlDew0x0c : public IPalette0x4 {
+class DirectDrawPalette : public IPalette0x4 {
 public:
 	enum {
 		c_errorBufferSize = 128,
@@ -30,8 +30,8 @@ class PearlDew0x0c : public IPalette0x4 {
 		c_332RedStride = c_332GreenLevels * c_332GreenStride
 	};
 
-	PearlDew0x0c();
-	~PearlDew0x0c();
+	DirectDrawPalette();
+	~DirectDrawPalette();
 
 	void CreateDirectDrawPalette(class BronzeFalcon0xc8770* p_renderer, class GolSurfaceFormat* p_textureFormat);
 	void Release();
@@ -54,4 +54,4 @@ class PearlDew0x0c : public IPalette0x4 {
 	LegoU16 m_entryCount;          // 0x0a
 };
 
-#endif // GOLDP_PEARLDEW0X0C_H
+#endif // GOLDP_DIRECTDRAWPALETTE_H
diff --git a/GolDP/include/falcondunebag0x10.h b/GolDP/include/falcondunebag0x10.h
@@ -17,7 +17,7 @@ class FalconDuneBag0x10 : public BronzeDuneBag0xc {
 	void CopyEntriesFrom(IPalette0x4* p_source) override;                             // vtable+0x04
 	void SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count) override; // vtable+0x08
 
-	void FUN_10014770(const GolSurfaceFormat& p_textureFormat);
+	void Initialize(const GolSurfaceFormat& p_textureFormat);
 	void Destroy();
 
 	LegoU16* GetMappedEntries() const { return m_unk0x0c; }
diff --git a/GolDP/include/silverdune0x30.h b/GolDP/include/silverdune0x30.h
@@ -6,7 +6,7 @@
 #include "rectangle.h"
 #include "types.h"
 
-class PearlDew0x0c;
+class DirectDrawPalette;
 class IPalette0x4;
 class BronzeFalcon0xc8770;
 
diff --git a/GolDP/include/slatepeak0x58.h b/GolDP/include/slatepeak0x58.h
@@ -4,7 +4,7 @@
 #include "azureridge0x38.h"
 #include "compat.h"
 #include "depthbuffer0x38.h"
-#include "pearldew0x0c.h"
+#include "directdrawpalette.h"
 
 class BronzeFalcon0xc8770;
 
@@ -47,7 +47,7 @@ class SlatePeak0x58 : public AzureRidge0x38 {
 	void DetachDepthBuffer(DepthBuffer0x38* p_depthBuffer);
 	void SetDisplayPalette(BronzeFalcon0xc8770* p_renderer);
 
-	PearlDew0x0c m_palette;                // 0x38
+	DirectDrawPalette m_palette;           // 0x38
 	GolDrawState* m_drawState;             // 0x44
 	LPDIRECTDRAWSURFACE4 m_displaySurface; // 0x48
 	LPDIRECTDRAWSURFACE4 m_renderSurface;  // 0x4c
diff --git a/GolDP/src/bronzedunebag0xc.cpp b/GolDP/src/bronzedunebag0xc.cpp
@@ -28,7 +28,7 @@ void BronzeDuneBag0xc::Initialize(const GolSurfaceFormat& p_textureFormat)
 	if (m_entries != NULL) {
 		m_size = 0;
 		delete[] m_entries;
-		m_entries = 0;
+		m_entries = NULL;
 	}
 
 	m_size = 1 << p_textureFormat.m_bitsPerPixel;
diff --git a/GolDP/src/directdrawpalette.cpp b/GolDP/src/directdrawpalette.cpp
@@ -1,26 +1,26 @@
-#include "pearldew0x0c.h"
+#include "directdrawpalette.h"
 
 #include "bronzefalcon0xc8770.h"
 #include "golerror.h"
 #include "golsurfaceformat.h"
 
 #include <stdio.h>
 
-DECOMP_SIZE_ASSERT(PearlDew0x0c, 0x0c)
+DECOMP_SIZE_ASSERT(DirectDrawPalette, 0x0c)
 
 // GLOBAL: GOLDP 0x10063150
-PALETTEENTRY g_paletteEntries[PearlDew0x0c::c_paletteEntries8Bit];
+PALETTEENTRY g_paletteEntries[DirectDrawPalette::c_paletteEntries8Bit];
 
 // FUNCTION: GOLDP 0x10007190
-PearlDew0x0c::PearlDew0x0c()
+DirectDrawPalette::DirectDrawPalette()
 {
 	m_palette = NULL;
 	m_firstEntry = 0;
 	m_entryCount = 0;
 }
 
 // FUNCTION: GOLDP 0x100071b0
-PearlDew0x0c::~PearlDew0x0c()
+DirectDrawPalette::~DirectDrawPalette()
 {
 	if (m_palette) {
 		m_palette->Release();
@@ -32,7 +32,7 @@ PearlDew0x0c::~PearlDew0x0c()
 }
 
 // FUNCTION: GOLDP 0x100071e0
-void PearlDew0x0c::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolSurfaceFormat* p_textureFormat)
+void DirectDrawPalette::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolSurfaceFormat* p_textureFormat)
 {
 	LegoChar buffer[c_errorBufferSize];
 
@@ -133,7 +133,7 @@ void PearlDew0x0c::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolS
 }
 
 // FUNCTION: GOLDP 0x100073f0
-void PearlDew0x0c::Release()
+void DirectDrawPalette::Release()
 {
 	if (m_palette) {
 		m_palette->Release();
@@ -145,7 +145,7 @@ void PearlDew0x0c::Release()
 }
 
 // FUNCTION: GOLDP 0x10007420
-void PearlDew0x0c::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)
+void DirectDrawPalette::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)
 {
 	LegoChar buffer[c_errorBufferSize];
 
@@ -182,7 +182,7 @@ void PearlDew0x0c::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_c
 }
 
 // FUNCTION: GOLDP 0x10007500
-void PearlDew0x0c::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)
+void DirectDrawPalette::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)
 {
 	LegoChar buffer[c_errorBufferSize];
 
@@ -201,7 +201,7 @@ void PearlDew0x0c::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_c
 }
 
 // FUNCTION: GOLDP 0x100075b0
-void PearlDew0x0c::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)
+void DirectDrawPalette::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)
 {
 	PALETTEENTRY entry;
 	LegoChar buffer[c_errorBufferSize];
@@ -219,7 +219,7 @@ void PearlDew0x0c::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)
 }
 
 // FUNCTION: GOLDP 0x10007620
-void PearlDew0x0c::CopyEntriesFrom(IPalette0x4* p_source)
+void DirectDrawPalette::CopyEntriesFrom(IPalette0x4* p_source)
 {
 	ColorRGBA entry;
 	LegoChar buffer[c_errorBufferSize];
@@ -241,7 +241,7 @@ void PearlDew0x0c::CopyEntriesFrom(IPalette0x4* p_source)
 }
 
 // FUNCTION: GOLDP 0x100076d0
-LegoS32 PearlDew0x0c::FindEntry(const ColorRGBA& p_entry)
+LegoS32 DirectDrawPalette::FindEntry(const ColorRGBA& p_entry)
 {
 	DWORD caps;
 	LegoChar buffer[c_errorBufferSize];
@@ -280,19 +280,19 @@ LegoS32 PearlDew0x0c::FindEntry(const ColorRGBA& p_entry)
 }
 
 // FUNCTION: GOLDP 0x100077b0
-LegoU32 PearlDew0x0c::GetFirstEntry()
+LegoU32 DirectDrawPalette::GetFirstEntry()
 {
 	return m_firstEntry;
 }
 
 // FUNCTION: GOLDP 0x100077c0
-LegoU32 PearlDew0x0c::GetEntryCount()
+LegoU32 DirectDrawPalette::GetEntryCount()
 {
 	return m_entryCount;
 }
 
 // FUNCTION: GOLDP 0x100077d0
-LegoU32 PearlDew0x0c::GetPaletteSize()
+LegoU32 DirectDrawPalette::GetPaletteSize()
 {
 	if (m_entryCount == c_paletteEntries8BitUsable) {
 		return c_paletteEntries8Bit;
@@ -302,7 +302,7 @@ LegoU32 PearlDew0x0c::GetPaletteSize()
 }
 
 // STUB: GOLDP 0x100077f0
-void PearlDew0x0c::Set332PaletteEntries()
+void DirectDrawPalette::Set332PaletteEntries()
 {
 	LegoChar buffer[c_errorBufferSize];
 
diff --git a/GolDP/src/falcondunebag0x10.cpp b/GolDP/src/falcondunebag0x10.cpp
@@ -20,7 +20,7 @@ FalconDuneBag0x10::~FalconDuneBag0x10()
 }
 
 // FUNCTION: GOLDP 0x10014770
-void FalconDuneBag0x10::FUN_10014770(const GolSurfaceFormat& p_textureFormat)
+void FalconDuneBag0x10::Initialize(const GolSurfaceFormat& p_textureFormat)
 {
 	if (m_entries != NULL) {
 		if (m_unk0x0c != NULL) {
@@ -31,7 +31,7 @@ void FalconDuneBag0x10::FUN_10014770(const GolSurfaceFormat& p_textureFormat)
 		Shutdown();
 	}
 
-	Initialize(p_textureFormat);
+	BronzeDuneBag0xc::Initialize(p_textureFormat);
 
 	m_unk0x0c = new LegoU16[m_size];
 	if (m_unk0x0c == NULL) {
diff --git a/GolDP/src/purpledune0x7c.cpp b/GolDP/src/purpledune0x7c.cpp
@@ -2,11 +2,11 @@
 
 #include "bronzefalcon0xc8770.h"
 #include "ddrawutil.h"
+#include "directdrawpalette.h"
 #include "falcondunebag0x10.h"
 #include "golcommondrawstate.h"
 #include "golerror.h"
 #include "golimgfile.h"
-#include "pearldew0x0c.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -404,11 +404,11 @@ void PurpleDune0x7c::FUN_10016380()
 	}
 	else {
 		if (palette != NULL) {
-			static_cast<PearlDew0x0c*>(palette)->Release();
+			static_cast<DirectDrawPalette*>(palette)->Release();
 
 			palette = m_palette;
 			if (palette != NULL) {
-				delete static_cast<PearlDew0x0c*>(palette);
+				delete static_cast<DirectDrawPalette*>(palette);
 			}
 
 			m_palette = NULL;
@@ -528,11 +528,11 @@ void PurpleDune0x7c::FUN_100165c0(GolCommonDrawState* p_drawState, BronzeFalcon0
 			break;
 		}
 
-		if ((m_palette = new PearlDew0x0c) == NULL) {
+		if ((m_palette = new DirectDrawPalette) == NULL) {
 			GOL_FATALERROR(c_golErrorOutOfMemory);
 		}
 
-		static_cast<PearlDew0x0c*>(m_palette)->CreateDirectDrawPalette(&p_renderer, &m_textureFormat2);
+		static_cast<DirectDrawPalette*>(m_palette)->CreateDirectDrawPalette(&p_renderer, &m_textureFormat2);
 	}
 	else {
 		surfaceDesc.ddpfPixelFormat.dwRGBBitCount = m_textureFormat2.m_bitsPerPixel;
@@ -597,7 +597,7 @@ void PurpleDune0x7c::FUN_100165c0(GolCommonDrawState* p_drawState, BronzeFalcon0
 		}
 	}
 	else {
-		result = m_surface->SetPalette(static_cast<PearlDew0x0c*>(m_palette)->GetPalette());
+		result = m_surface->SetPalette(static_cast<DirectDrawPalette*>(m_palette)->GetPalette());
 		if (result) {
 			LegoChar errorMessage[64];
 			::sprintf(errorMessage, "Unable to set texture palette\nerror %x", result);
@@ -659,7 +659,7 @@ void PurpleDune0x7c::FUN_100168c0(BronzeFalcon0xc8770& p_renderer)
 				GOL_FATALERROR(c_golErrorOutOfMemory);
 			}
 
-			static_cast<FalconDuneBag0x10*>(m_palette)->FUN_10014770(m_textureFormat2);
+			static_cast<FalconDuneBag0x10*>(m_palette)->Initialize(m_textureFormat2);
 			mipmap->m_paletteData = static_cast<FalconDuneBag0x10*>(m_palette)->m_unk0x0c;
 		}
 		else {
diff --git a/GolDP/src/silverdune0x30.cpp b/GolDP/src/silverdune0x30.cpp
@@ -1,6 +1,6 @@
 #include "silverdune0x30.h"
 
-#include "pearldew0x0c.h"
+#include "directdrawpalette.h"
 
 DECOMP_SIZE_ASSERT(SilverDune0x30, 0x30)
 
diff --git a/LEGORacers/include/imaginarynotion0x290.h b/LEGORacers/include/imaginarynotion0x290.h
@@ -143,7 +143,7 @@ class ImaginaryNotion0x290 : public ImaginaryInterface {
 	// ImaginaryNotion0x290::`scalar deleting destructor'
 
 protected:
-	undefined4 m_unk0x04;                            // 0x004
+	LegoBool32 m_initialized;                        // 0x004
 	CeruleanEmperor0x4c m_unk0x08;                   // 0x008
 	PorcelainVeil0x50* m_menuStyles;                 // 0x054
 	CeruleanQueen0x58 m_unk0x58;                     // 0x058
diff --git a/LEGORacers/include/menumanager.h b/LEGORacers/include/menumanager.h
@@ -64,7 +64,7 @@ class MenuManager : public CactusInterface0x4 {
 	void Reset();
 	LegoS32 Initialize(LegoRacers::Context* p_context);
 	LegoS32 Shutdown();
-	void FUN_0042cd60();
+	void InitializeTextRenderer();
 	void FUN_0042cde0();
 	void ReleaseRendererObject();
 	void InitializeInputBindings();
@@ -85,13 +85,13 @@ class MenuManager : public CactusInterface0x4 {
 private:
 	void ShutdownInputBindings();
 	void ShutdownAudio();
-	void FUN_0042d080();
+	void UnloadMenuImages();
 	void FUN_0042d730();
 
 	MenuToolContext0x4bc8 m_unk0x04;       // 0x04
 	ChromeSpike0x4 m_unk0x4bcc;            // 0x4bcc
 	CrimsonSun0xa4 m_unk0x4bd0;            // 0x4bd0
-	CopperCrest0x40 m_unk0x4c74;           // 0x4c74
+	CopperCrest0x40 m_textRenderer;        // 0x4c74
 	GolExport* m_golExport;                // 0x4cd4
 	BronzeFalcon0xc8770* m_renderer;       // 0x4cd8
 	AwakeKite0x20* m_imageTable;           // 0x4cdc
@@ -107,7 +107,7 @@ class MenuManager : public CactusInterface0x4 {
 	MenuToolCreateParams0x30 m_unk0x4d98;  // 0x4d98
 	ImaginaryTool0x368* m_unk0x4dc8;       // 0x4dc8
 	undefined4 m_unk0x4dcc;                // 0x4dcc
-	LegoBool32 m_unk0x4dd0;                // 0x4dd0
+	LegoBool32 m_running;                  // 0x4dd0
 };
 
 #endif // MENUMANAGER_H
diff --git a/LEGORacers/include/menutoolcontext0x4bc8.h b/LEGORacers/include/menutoolcontext0x4bc8.h
@@ -24,7 +24,7 @@
 class MenuToolContext0x4bc8 {
 public:
 	LegoRacers::Context* m_context;               // 0x00
-	StackOfLegoU16 m_unk0x04;                     // 0x04
+	StackOfLegoU16 m_menuStack;                   // 0x04
 	OnyxBreeze0x248 m_inputBindings;              // 0x10
 	CitrineGrove0x1f4c m_unk0x258;                // 0x258
 	TopazBurst0x14 m_unk0x21a4;                   // 0x21a4
diff --git a/LEGORacers/src/imaginarychisel0x658.cpp b/LEGORacers/src/imaginarychisel0x658.cpp
@@ -28,7 +28,7 @@ ImaginaryChisel0x658::~ImaginaryChisel0x658()
 // FUNCTION: LEGORACERS 0x004797a0
 LegoBool32 ImaginaryChisel0x658::VTable0x8c(MenuToolContext0x4bc8* p_context, MenuToolCreateParams0x30* p_createParams)
 {
-	if (m_unk0x04) {
+	if (m_initialized) {
 		Destroy();
 	}
 
@@ -137,6 +137,6 @@ LegoBool32 ImaginaryChisel0x658::VTable0x78(undefined4 p_unk0x04)
 void ImaginaryChisel0x658::VTable0x84()
 {
 	m_unk0xc4->SetUnk0x41(TRUE);
-	m_context->m_unk0x04.Pop();
-	m_context->m_unk0x04.Push(2);
+	m_context->m_menuStack.Pop();
+	m_context->m_menuStack.Push(2);
 }
diff --git a/LEGORacers/src/imaginarydrill0x2450.cpp b/LEGORacers/src/imaginarydrill0x2450.cpp
diff --git a/LEGORacers/src/imaginaryhammer0x658.cpp b/LEGORacers/src/imaginaryhammer0x658.cpp
diff --git a/LEGORacers/src/imaginarylever0x1d7c.cpp b/LEGORacers/src/imaginarylever0x1d7c.cpp
diff --git a/LEGORacers/src/imaginarynotion0x290.cpp b/LEGORacers/src/imaginarynotion0x290.cpp
diff --git a/LEGORacers/src/imaginarytool0x368.cpp b/LEGORacers/src/imaginarytool0x368.cpp
diff --git a/LEGORacers/src/menumanager.cpp b/LEGORacers/src/menumanager.cpp

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ void BronzeDuneBag0xc::Initialize(const GolSurfaceFormat& p_textureFormat)`
`28`	`28`	`if (m_entries != NULL) {`
`29`	`29`	`m_size = 0;`
`30`	`30`	`delete[] m_entries;`
`31`		`- m_entries = 0;`
	`31`	`+ m_entries = NULL;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`m_size = 1 << p_textureFormat.m_bitsPerPixel;`
Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,26 @@`
`1`		`-#include "pearldew0x0c.h"`
	`1`	`+#include "directdrawpalette.h"`
`2`	`2`
`3`	`3`	`#include "bronzefalcon0xc8770.h"`
`4`	`4`	`#include "golerror.h"`
`5`	`5`	`#include "golsurfaceformat.h"`
`6`	`6`
`7`	`7`	`#include <stdio.h>`
`8`	`8`
`9`		`-DECOMP_SIZE_ASSERT(PearlDew0x0c, 0x0c)`
	`9`	`+DECOMP_SIZE_ASSERT(DirectDrawPalette, 0x0c)`
`10`	`10`
`11`	`11`	`// GLOBAL: GOLDP 0x10063150`
`12`		`-PALETTEENTRY g_paletteEntries[PearlDew0x0c::c_paletteEntries8Bit];`
	`12`	`+PALETTEENTRY g_paletteEntries[DirectDrawPalette::c_paletteEntries8Bit];`
`13`	`13`
`14`	`14`	`// FUNCTION: GOLDP 0x10007190`
`15`		`-PearlDew0x0c::PearlDew0x0c()`
	`15`	`+DirectDrawPalette::DirectDrawPalette()`
`16`	`16`	`{`
`17`	`17`	`m_palette = NULL;`
`18`	`18`	`m_firstEntry = 0;`
`19`	`19`	`m_entryCount = 0;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// FUNCTION: GOLDP 0x100071b0`
`23`		`-PearlDew0x0c::~PearlDew0x0c()`
	`23`	`+DirectDrawPalette::~DirectDrawPalette()`
`24`	`24`	`{`
`25`	`25`	`if (m_palette) {`
`26`	`26`	`m_palette->Release();`
`@@ -32,7 +32,7 @@ PearlDew0x0c::~PearlDew0x0c()`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// FUNCTION: GOLDP 0x100071e0`
`35`		`-void PearlDew0x0c::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolSurfaceFormat* p_textureFormat)`
	`35`	`+void DirectDrawPalette::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolSurfaceFormat* p_textureFormat)`
`36`	`36`	`{`
`37`	`37`	`LegoChar buffer[c_errorBufferSize];`
`38`	`38`
`@@ -133,7 +133,7 @@ void PearlDew0x0c::CreateDirectDrawPalette(BronzeFalcon0xc8770* p_renderer, GolS`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// FUNCTION: GOLDP 0x100073f0`
`136`		`-void PearlDew0x0c::Release()`
	`136`	`+void DirectDrawPalette::Release()`
`137`	`137`	`{`
`138`	`138`	`if (m_palette) {`
`139`	`139`	`m_palette->Release();`
`@@ -145,7 +145,7 @@ void PearlDew0x0c::Release()`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`// FUNCTION: GOLDP 0x10007420`
`148`		`-void PearlDew0x0c::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)`
	`148`	`+void DirectDrawPalette::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)`
`149`	`149`	`{`
`150`	`150`	`LegoChar buffer[c_errorBufferSize];`
`151`	`151`
`@@ -182,7 +182,7 @@ void PearlDew0x0c::GetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_c`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// FUNCTION: GOLDP 0x10007500`
`185`		`-void PearlDew0x0c::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)`
	`185`	`+void DirectDrawPalette::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_count)`
`186`	`186`	`{`
`187`	`187`	`LegoChar buffer[c_errorBufferSize];`
`188`	`188`
`@@ -201,7 +201,7 @@ void PearlDew0x0c::SetEntries(ColorRGBA* p_entries, LegoU32 p_start, LegoU32 p_c`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// FUNCTION: GOLDP 0x100075b0`
`204`		`-void PearlDew0x0c::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)`
	`204`	`+void DirectDrawPalette::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)`
`205`	`205`	`{`
`206`	`206`	`PALETTEENTRY entry;`
`207`	`207`	`LegoChar buffer[c_errorBufferSize];`
`@@ -219,7 +219,7 @@ void PearlDew0x0c::GetEntry(ColorRGBA* p_entry, LegoU32 p_index)`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`// FUNCTION: GOLDP 0x10007620`
`222`		`-void PearlDew0x0c::CopyEntriesFrom(IPalette0x4* p_source)`
	`222`	`+void DirectDrawPalette::CopyEntriesFrom(IPalette0x4* p_source)`
`223`	`223`	`{`
`224`	`224`	`ColorRGBA entry;`
`225`	`225`	`LegoChar buffer[c_errorBufferSize];`
`@@ -241,7 +241,7 @@ void PearlDew0x0c::CopyEntriesFrom(IPalette0x4* p_source)`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// FUNCTION: GOLDP 0x100076d0`
`244`		`-LegoS32 PearlDew0x0c::FindEntry(const ColorRGBA& p_entry)`
	`244`	`+LegoS32 DirectDrawPalette::FindEntry(const ColorRGBA& p_entry)`
`245`	`245`	`{`
`246`	`246`	`DWORD caps;`
`247`	`247`	`LegoChar buffer[c_errorBufferSize];`
`@@ -280,19 +280,19 @@ LegoS32 PearlDew0x0c::FindEntry(const ColorRGBA& p_entry)`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`// FUNCTION: GOLDP 0x100077b0`
`283`		`-LegoU32 PearlDew0x0c::GetFirstEntry()`
	`283`	`+LegoU32 DirectDrawPalette::GetFirstEntry()`
`284`	`284`	`{`
`285`	`285`	`return m_firstEntry;`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`// FUNCTION: GOLDP 0x100077c0`
`289`		`-LegoU32 PearlDew0x0c::GetEntryCount()`
	`289`	`+LegoU32 DirectDrawPalette::GetEntryCount()`
`290`	`290`	`{`
`291`	`291`	`return m_entryCount;`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`// FUNCTION: GOLDP 0x100077d0`
`295`		`-LegoU32 PearlDew0x0c::GetPaletteSize()`
	`295`	`+LegoU32 DirectDrawPalette::GetPaletteSize()`
`296`	`296`	`{`
`297`	`297`	`if (m_entryCount == c_paletteEntries8BitUsable) {`
`298`	`298`	`return c_paletteEntries8Bit;`
`@@ -302,7 +302,7 @@ LegoU32 PearlDew0x0c::GetPaletteSize()`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`// STUB: GOLDP 0x100077f0`
`305`		`-void PearlDew0x0c::Set332PaletteEntries()`
	`305`	`+void DirectDrawPalette::Set332PaletteEntries()`
`306`	`306`	`{`
`307`	`307`	`LegoChar buffer[c_errorBufferSize];`
`308`	`308`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ FalconDuneBag0x10::~FalconDuneBag0x10()`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`// FUNCTION: GOLDP 0x10014770`
`23`		`-void FalconDuneBag0x10::FUN_10014770(const GolSurfaceFormat& p_textureFormat)`
	`23`	`+void FalconDuneBag0x10::Initialize(const GolSurfaceFormat& p_textureFormat)`
`24`	`24`	`{`
`25`	`25`	`if (m_entries != NULL) {`
`26`	`26`	`if (m_unk0x0c != NULL) {`
`@@ -31,7 +31,7 @@ void FalconDuneBag0x10::FUN_10014770(const GolSurfaceFormat& p_textureFormat)`
`31`	`31`	`Shutdown();`
`32`	`32`	`}`
`33`	`33`
`34`		`- Initialize(p_textureFormat);`
	`34`	`+ BronzeDuneBag0xc::Initialize(p_textureFormat);`
`35`	`35`
`36`	`36`	`m_unk0x0c = new LegoU16[m_size];`
`37`	`37`	`if (m_unk0x0c == NULL) {`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`#include "bronzefalcon0xc8770.h"`
`4`	`4`	`#include "ddrawutil.h"`
	`5`	`+#include "directdrawpalette.h"`
`5`	`6`	`#include "falcondunebag0x10.h"`
`6`	`7`	`#include "golcommondrawstate.h"`
`7`	`8`	`#include "golerror.h"`
`8`	`9`	`#include "golimgfile.h"`
`9`		`-#include "pearldew0x0c.h"`
`10`	`10`
`11`	`11`	`#include <stdio.h>`
`12`	`12`	`#include <string.h>`
`@@ -404,11 +404,11 @@ void PurpleDune0x7c::FUN_10016380()`
`404`	`404`	`}`
`405`	`405`	`else {`
`406`	`406`	`if (palette != NULL) {`
`407`		`- static_cast<PearlDew0x0c*>(palette)->Release();`
	`407`	`+ static_cast<DirectDrawPalette*>(palette)->Release();`
`408`	`408`
`409`	`409`	`palette = m_palette;`
`410`	`410`	`if (palette != NULL) {`
`411`		`- delete static_cast<PearlDew0x0c*>(palette);`
	`411`	`+ delete static_cast<DirectDrawPalette*>(palette);`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`m_palette = NULL;`
`@@ -528,11 +528,11 @@ void PurpleDune0x7c::FUN_100165c0(GolCommonDrawState* p_drawState, BronzeFalcon0`
`528`	`528`	`break;`
`529`	`529`	`}`
`530`	`530`
`531`		`- if ((m_palette = new PearlDew0x0c) == NULL) {`
	`531`	`+ if ((m_palette = new DirectDrawPalette) == NULL) {`
`532`	`532`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`533`	`533`	`}`
`534`	`534`
`535`		`- static_cast<PearlDew0x0c*>(m_palette)->CreateDirectDrawPalette(&p_renderer, &m_textureFormat2);`
	`535`	`+ static_cast<DirectDrawPalette*>(m_palette)->CreateDirectDrawPalette(&p_renderer, &m_textureFormat2);`
`536`	`536`	`}`
`537`	`537`	`else {`
`538`	`538`	`surfaceDesc.ddpfPixelFormat.dwRGBBitCount = m_textureFormat2.m_bitsPerPixel;`
`@@ -597,7 +597,7 @@ void PurpleDune0x7c::FUN_100165c0(GolCommonDrawState* p_drawState, BronzeFalcon0`
`597`	`597`	`}`
`598`	`598`	`}`
`599`	`599`	`else {`
`600`		`- result = m_surface->SetPalette(static_cast<PearlDew0x0c*>(m_palette)->GetPalette());`
	`600`	`+ result = m_surface->SetPalette(static_cast<DirectDrawPalette*>(m_palette)->GetPalette());`
`601`	`601`	`if (result) {`
`602`	`602`	`LegoChar errorMessage[64];`
`603`	`603`	`::sprintf(errorMessage, "Unable to set texture palette\nerror %x", result);`
`@@ -659,7 +659,7 @@ void PurpleDune0x7c::FUN_100168c0(BronzeFalcon0xc8770& p_renderer)`
`659`	`659`	`GOL_FATALERROR(c_golErrorOutOfMemory);`
`660`	`660`	`}`
`661`	`661`
`662`		`- static_cast<FalconDuneBag0x10*>(m_palette)->FUN_10014770(m_textureFormat2);`
	`662`	`+ static_cast<FalconDuneBag0x10*>(m_palette)->Initialize(m_textureFormat2);`
`663`	`663`	`mipmap->m_paletteData = static_cast<FalconDuneBag0x10*>(m_palette)->m_unk0x0c;`
`664`	`664`	`}`
`665`	`665`	`else {`