Type-model portable findings: font checkpoint, standings context, root icon params (#511)

Adopted from racers-portable, all byte-neutral (full reccmp report diff
against baseline: zero changes on either target; datacmp clean):

- GolFontLibrary::m_hashTableCheckpoint stores a GolHashTable::Entry*;
  type it as one instead of undefined4 round-tripped through casts.
- CircuitStandings::SetContext returns the previous context pointer;
  declare it so (the caller keeps its status cast).
- g_rootIconParams is a MenuWidget::CreateParams image (zeros with
  m_id = 1), not an anonymous dword array; model it as the typed
  aggregate.
- compat.h: clang/gcc also take the COMPAT_MODE path (MinGW already
  did); the MSVC 6.0 configuration is unaffected.

Author: foxtacles

GolDP/include/font/golfontlibrary.h

@@ -1,6 +1,7 @@
 #ifndef GOLFONTLIBRARY_H
 #define GOLFONTLIBRARY_H
 
+#include "golhashtable.h"
 #include "golnametable.h"
 #include "goltxtparser.h"
 #include "image/goltiledtexture.h"
@@ -69,13 +70,13 @@ class GolFontLibrary : public GolNameTable {
 protected:
 	void ReadFontCharList(GolFileParser* p_parser, undefined2* p_chars, LegoU16* p_count);
 
-	GolD3DRenderDevice* m_renderer;   // 0x0c
-	GolFontLibrary* m_next;           // 0x10
-	LegoU32 m_itemCount;              // 0x14
-	GolString* m_charStrings;         // 0x18
-	undefined2** m_charCodes;         // 0x1c
-	LegoU16* m_charCounts;            // 0x20
-	undefined4 m_hashTableCheckpoint; // 0x24
+	GolD3DRenderDevice* m_renderer;             // 0x0c
+	GolFontLibrary* m_next;                     // 0x10
+	LegoU32 m_itemCount;                        // 0x14
+	GolString* m_charStrings;                   // 0x18
+	undefined2** m_charCodes;                   // 0x1c
+	LegoU16* m_charCounts;                      // 0x20
+	GolHashTable::Entry* m_hashTableCheckpoint; // 0x24
 };
 
 #endif // GOLFONTLIBRARY_H

GolDP/src/font/golfontlibrary.cpp

@@ -21,7 +21,7 @@ GolFontLibrary::GolFontLibrary()
 {
 	m_renderer = NULL;
 	m_itemCount = 0;
-	m_hashTableCheckpoint = 0;
+	m_hashTableCheckpoint = NULL;
 }
 
 // FUNCTION: GOLDP 0x1001d870
@@ -83,7 +83,7 @@ void GolFontLibrary::LoadFontDefinitions(
 	}
 
 	GolNameTable::Allocate(m_itemCount);
-	m_hashTableCheckpoint = g_hashTable ? (undefined4) g_hashTable->GetCurrentEntry() : 0;
+	m_hashTableCheckpoint = g_hashTable ? g_hashTable->GetCurrentEntry() : NULL;
 	AllocateItems();
 
 	for (LegoU32 i = 0; i < m_itemCount; i++) {
@@ -171,7 +171,7 @@ void GolFontLibrary::LoadFontDefinitions(
 	delete parser;
 
 	if (g_hashTable) {
-		g_hashTable->SetCurrentEntry((GolHashTable::Entry*) m_hashTableCheckpoint);
+		g_hashTable->SetCurrentEntry(m_hashTableCheckpoint);
 	}
 
 	for (LegoU32 j = 0; j < m_itemCount; j++) {

LEGORacers/include/race/circuitstandings.h

@@ -16,7 +16,7 @@ class CircuitStandings {
 	~CircuitStandings();
 
 	void Reset();
-	undefined4 SetContext(LegoRacers::Context* p_context);
+	LegoRacers::Context* SetContext(LegoRacers::Context* p_context);
 	void Shutdown();
 	LegoU32 GetPoints(LegoU32 p_index);
 	LegoS32 GetRank(LegoU32 p_index);

LEGORacers/src/menu/screens/menuscreen.cpp

@@ -35,7 +35,7 @@ DECOMP_SIZE_ASSERT(MenuScreen, 0x290)
 DECOMP_SIZE_ASSERT(SceneRefBinding, 0x54)
 
 // GLOBAL: LEGORACERS 0x004b2240
-const undefined4 g_rootIconParams[14] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0};
+const MenuWidget::CreateParams g_rootIconParams = {NULL, NULL, NULL, NULL, {0, 0, 0, 0}, 1};
 
 // GLOBAL: LEGORACERS 0x004b2278
 const MenuIcon::CreateState g_rootIconState = {{0}};
@@ -132,7 +132,7 @@ LegoBool32 MenuScreen::CreateRootIcon()
 	MenuIcon::CreateParams createParams;
 
 	memset(&createParams, 0, sizeof(createParams));
-	memcpy(&createParams, g_rootIconParams, sizeof(g_rootIconParams));
+	memcpy(&createParams, &g_rootIconParams, sizeof(g_rootIconParams));
 
 	createParams.m_golExport = m_golExport;
 	createParams.m_renderer = m_renderer;

LEGORacers/src/race/circuitracerunner.cpp

@@ -49,7 +49,7 @@ LegoS32 CircuitRaceRunner::Initialize(LegoRacers::Context* p_context, RaceSessio
 	m_context = p_context;
 	m_session = p_session;
 	sprintf(p_context->m_commonDataDirectory, "GAMEDATA\\COMMON");
-	return m_standings.SetContext(m_context);
+	return (LegoS32) m_standings.SetContext(m_context);
 }
 
 // FUNCTION: LEGORACERS 0x0041ed60

LEGORacers/src/race/circuitstandings.cpp

@@ -53,7 +53,7 @@ void CircuitStandings::Reset()
 }
 
 // FUNCTION: LEGORACERS 0x00440270
-undefined4 CircuitStandings::SetContext(LegoRacers::Context* p_context)
+LegoRacers::Context* CircuitStandings::SetContext(LegoRacers::Context* p_context)
 {
 	LegoRacers::Context* previous = m_context;
 
@@ -63,7 +63,7 @@ undefined4 CircuitStandings::SetContext(LegoRacers::Context* p_context)
 	}
 
 	m_context = p_context;
-	return (undefined4) previous;
+	return previous;
 }
 
 // FUNCTION: LEGORACERS 0x004402a0

util/compat.h

@@ -5,7 +5,7 @@
 
 #define MSVC600_VERSION 1200
 
-#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER > MSVC600_VERSION)
+#if defined(__MINGW32__) || defined(__clang__) || defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER > MSVC600_VERSION)
 #define COMPAT_MODE
 #endif