From 4d3dbad04012ec9d0568ea3145bc3cd2654f97de Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:34:33 +0100 Subject: [PATCH 01/11] Rename FUN_1005d4b0 to UpdateMapLocatorPosition --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- LEGO1/lego/legoomni/src/race/legoracers.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 562581fa..99c27fe9 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -26,7 +26,7 @@ class LegoRaceMap : public virtual LegoRaceActor { void Animate(float p_time) override = 0; // vtable+0x70 // LegoRaceMap vtable - virtual void FUN_1005d4b0(); // vtable+0x00 + virtual void UpdateMapLocatorPosition(); // vtable+0x00 // SYNTHETIC: LEGO1 0x10012c50 // LegoRaceMap::`vbase destructor' diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 9637114d..2660a831 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -106,7 +106,7 @@ void LegoRaceMap::ParseAction(char* p_extra) // FUNCTION: LEGO1 0x1005d4b0 // FUNCTION: BETA10 0x100ca849 -void LegoRaceMap::FUN_1005d4b0() +void LegoRaceMap::UpdateMapLocatorPosition() { if (m_unk0x08) { short xPos = (GetWorldPosition()[0] - m_unk0x14) / m_unk0x18 * m_unk0x24; @@ -131,7 +131,7 @@ MxLong LegoRaceMap::Notify(MxParam& p_param) if (((LegoControlManagerNotificationParam&) p_param).m_enabledChild == 1) { m_unk0x08 = TRUE; - FUN_1005d4b0(); + UpdateMapLocatorPosition(); m_stillPresenter->Enable(TRUE); } else { diff --git a/LEGO1/lego/legoomni/src/race/legoracers.cpp b/LEGO1/lego/legoomni/src/race/legoracers.cpp index 8b1142f9..d338c861 100644 --- a/LEGO1/lego/legoomni/src/race/legoracers.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracers.cpp @@ -411,7 +411,7 @@ void LegoRaceCar::Animate(float p_time) } if (LegoCarRaceActor::m_animState == 1) { - FUN_1005d4b0(); + UpdateMapLocatorPosition(); if (!m_userNavFlag) { FUN_10080590(p_time); @@ -610,7 +610,7 @@ void LegoJetski::Animate(float p_time) LegoJetskiRaceActor::Animate(p_time); if (LegoCarRaceActor::m_animState == 1) { - FUN_1005d4b0(); + UpdateMapLocatorPosition(); if (!m_userNavFlag) { FUN_10080590(p_time); From 24dec597a494c50c1bf8934d6b869e4e8a495c62 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:35:25 +0100 Subject: [PATCH 02/11] Rename m_unk0x08 to m_mapEnabled --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 99c27fe9..6be4402b 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -35,7 +35,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // LegoRaceMap::`scalar deleting destructor' private: - MxBool m_unk0x08; // 0x08 + MxBool m_mapEnabled; // 0x08 MxStillPresenter* m_stillPresenter; // 0x0c // variable name verified by BETA10 0x100ca82b diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 2660a831..8e902b8e 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -15,7 +15,7 @@ DECOMP_SIZE_ASSERT(LegoRaceMap, 0x1b4) // FUNCTION: BETA10 0x100ca2c0 LegoRaceMap::LegoRaceMap() { - m_unk0x08 = FALSE; + m_mapEnabled = FALSE; m_stillPresenter = NULL; m_Map_Ctl = 0; ControlManager()->Register(this); @@ -108,7 +108,7 @@ void LegoRaceMap::ParseAction(char* p_extra) // FUNCTION: BETA10 0x100ca849 void LegoRaceMap::UpdateMapLocatorPosition() { - if (m_unk0x08) { + if (m_mapEnabled) { short xPos = (GetWorldPosition()[0] - m_unk0x14) / m_unk0x18 * m_unk0x24; short yPos = (GetWorldPosition()[2] - m_unk0x1c) / m_unk0x20 * m_unk0x28; @@ -130,12 +130,12 @@ MxLong LegoRaceMap::Notify(MxParam& p_param) m_Map_Ctl->GetAction()->GetObjectId() == ((LegoControlManagerNotificationParam&) p_param).m_clickedObjectId) { if (((LegoControlManagerNotificationParam&) p_param).m_enabledChild == 1) { - m_unk0x08 = TRUE; + m_mapEnabled = TRUE; UpdateMapLocatorPosition(); m_stillPresenter->Enable(TRUE); } else { - m_unk0x08 = FALSE; + m_mapEnabled = FALSE; m_stillPresenter->Enable(FALSE); } } From 87b1a5126d1777c58be3528d02816be99318f555 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:37:07 +0100 Subject: [PATCH 03/11] Rename m_unk0x14 to m_worldXOffset --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 6be4402b..caa84482 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -42,7 +42,7 @@ class LegoRaceMap : public virtual LegoRaceActor { MxControlPresenter* m_Map_Ctl; // 0x10 // likely an x-offset of the race map in world space - float m_unk0x14; // 0x14 + float m_worldXOffset; // 0x14 // inversely scales the map in x direction (either convert world->screen space or to control the size) float m_unk0x18; // 0x18 // likely a y-offset of the race map in world space diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 8e902b8e..40d44893 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -54,7 +54,7 @@ void LegoRaceMap::ParseAction(char* p_extra) if (KeyValueStringParse(value, g_mapGeometry, p_extra)) { char* token = strtok(value, g_parseExtraTokens); if (token != NULL) { - m_unk0x14 = atof(token); + m_worldXOffset = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -109,7 +109,7 @@ void LegoRaceMap::ParseAction(char* p_extra) void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { - short xPos = (GetWorldPosition()[0] - m_unk0x14) / m_unk0x18 * m_unk0x24; + short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_unk0x18 * m_unk0x24; short yPos = (GetWorldPosition()[2] - m_unk0x1c) / m_unk0x20 * m_unk0x28; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); From 968b030abafa8638c57c79067ff68b1bbb57cc87 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:37:38 +0100 Subject: [PATCH 04/11] Rename m_unk0x1c to m_worldYOffset --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index caa84482..6fb791f7 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -46,7 +46,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // inversely scales the map in x direction (either convert world->screen space or to control the size) float m_unk0x18; // 0x18 // likely a y-offset of the race map in world space - float m_unk0x1c; // 0x1c + float m_worldYOffset; // 0x1c // inversely scales the map in y direction (either convert world->screen space or to control the size) float m_unk0x20; // 0x20 // scales the map in x direction (either convert world->screen space or to change the size) diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 40d44893..738d1335 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -64,7 +64,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x1c = atof(token); + m_worldYOffset = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -110,7 +110,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_unk0x18 * m_unk0x24; - short yPos = (GetWorldPosition()[2] - m_unk0x1c) / m_unk0x20 * m_unk0x28; + short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_unk0x20 * m_unk0x28; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); } From 949c6449052986b2adcc7e33cd79941afbbcf574 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:38:09 +0100 Subject: [PATCH 05/11] Rename m_unk0x18 to m_worldXScale --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 6fb791f7..c9d4c4aa 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -44,7 +44,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // likely an x-offset of the race map in world space float m_worldXOffset; // 0x14 // inversely scales the map in x direction (either convert world->screen space or to control the size) - float m_unk0x18; // 0x18 + float m_worldXScale; // 0x18 // likely a y-offset of the race map in world space float m_worldYOffset; // 0x1c // inversely scales the map in y direction (either convert world->screen space or to control the size) diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 738d1335..06480b95 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -59,7 +59,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x18 = atof(token); + m_worldXScale = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -109,7 +109,7 @@ void LegoRaceMap::ParseAction(char* p_extra) void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { - short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_unk0x18 * m_unk0x24; + short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_unk0x24; short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_unk0x20 * m_unk0x28; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); From deb70d488284ed10e696607a1854b825bc25630f Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:38:34 +0100 Subject: [PATCH 06/11] Rename m_unk0x20 to m_worldYScale --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index c9d4c4aa..97420a4b 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -48,7 +48,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // likely a y-offset of the race map in world space float m_worldYOffset; // 0x1c // inversely scales the map in y direction (either convert world->screen space or to control the size) - float m_unk0x20; // 0x20 + float m_worldYScale; // 0x20 // scales the map in x direction (either convert world->screen space or to change the size) float m_unk0x24; // 0x24 // scales the map in y direction (either convert world->screen space or to change the size) diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 06480b95..b03641cf 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -69,7 +69,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x20 = atof(token); + m_worldYScale = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -110,7 +110,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_unk0x24; - short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_unk0x20 * m_unk0x28; + short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_unk0x28; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); } From 68b0ac0d16a9d0bdb741c1d77ac950e184ad5c7a Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:39:10 +0100 Subject: [PATCH 07/11] Rename m_unk0x24 to m_screenXScale --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 97420a4b..b522d1dc 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -50,7 +50,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // inversely scales the map in y direction (either convert world->screen space or to control the size) float m_worldYScale; // 0x20 // scales the map in x direction (either convert world->screen space or to change the size) - float m_unk0x24; // 0x24 + float m_screenXScale; // 0x24 // scales the map in y direction (either convert world->screen space or to change the size) float m_unk0x28; // 0x28 // likely an x-offset of the race map in screen space diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index b03641cf..500c9b37 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -74,7 +74,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x24 = atof(token); + m_screenXScale = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -109,7 +109,7 @@ void LegoRaceMap::ParseAction(char* p_extra) void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { - short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_unk0x24; + short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_screenXScale; short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_unk0x28; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); From d7c5d46fb304b595173ec27c3ddb450d03b555d7 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:39:41 +0100 Subject: [PATCH 08/11] Rename m_unk0x28 to m_screenYScale --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index b522d1dc..145e3b5a 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -52,7 +52,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // scales the map in x direction (either convert world->screen space or to change the size) float m_screenXScale; // 0x24 // scales the map in y direction (either convert world->screen space or to change the size) - float m_unk0x28; // 0x28 + float m_screenYScale; // 0x28 // likely an x-offset of the race map in screen space float m_unk0x2c; // 0x2c // likely a y-offset of the race map in screen space diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 500c9b37..a6e96526 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -79,7 +79,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x28 = atof(token); + m_screenYScale = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -110,7 +110,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_screenXScale; - short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_unk0x28; + short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_screenYScale; m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); } From d8a302eb53767b2b287be9ac52e3afef6fcfc814 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:40:20 +0100 Subject: [PATCH 09/11] Rename m_unk0x2c to m_screenXOffset --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 145e3b5a..cd613f04 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -54,7 +54,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // scales the map in y direction (either convert world->screen space or to change the size) float m_screenYScale; // 0x28 // likely an x-offset of the race map in screen space - float m_unk0x2c; // 0x2c + float m_screenXOffset; // 0x2c // likely a y-offset of the race map in screen space float m_unk0x30; // 0x30 }; diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index a6e96526..d7730fa5 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -84,7 +84,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x2c = atof(token); + m_screenXOffset = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -112,7 +112,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_screenXScale; short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_screenYScale; - m_stillPresenter->SetPosition(xPos + m_unk0x2c, m_unk0x30 - yPos); + m_stillPresenter->SetPosition(xPos + m_screenXOffset, m_unk0x30 - yPos); } } From 67a2971a0cb7abfc3f9aa81475122c00af81b731 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Mon, 5 Jan 2026 13:40:47 +0100 Subject: [PATCH 10/11] Rename m_unk0x30 to m_screenYOffset --- LEGO1/lego/legoomni/include/legoracemap.h | 2 +- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index cd613f04..513803ab 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -56,7 +56,7 @@ class LegoRaceMap : public virtual LegoRaceActor { // likely an x-offset of the race map in screen space float m_screenXOffset; // 0x2c // likely a y-offset of the race map in screen space - float m_unk0x30; // 0x30 + float m_screenYOffset; // 0x30 }; // GLOBAL: LEGO1 0x100d8848 diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index d7730fa5..9ac0f821 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -89,7 +89,7 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_unk0x30 = atof(token); + m_screenYOffset = atof(token); } } @@ -112,7 +112,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_screenXScale; short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_screenYScale; - m_stillPresenter->SetPosition(xPos + m_screenXOffset, m_unk0x30 - yPos); + m_stillPresenter->SetPosition(xPos + m_screenXOffset, m_screenYOffset - yPos); } } From b3e252a0c4f4140eaa2e44569c1ec17ed141ab7b Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Wed, 7 Jan 2026 22:56:59 +0100 Subject: [PATCH 11/11] Rename worldY to worldZ --- LEGO1/lego/legoomni/include/legoracemap.h | 8 ++++---- LEGO1/lego/legoomni/src/race/legoracemap.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoracemap.h b/LEGO1/lego/legoomni/include/legoracemap.h index 513803ab..448f11fa 100644 --- a/LEGO1/lego/legoomni/include/legoracemap.h +++ b/LEGO1/lego/legoomni/include/legoracemap.h @@ -45,10 +45,10 @@ class LegoRaceMap : public virtual LegoRaceActor { float m_worldXOffset; // 0x14 // inversely scales the map in x direction (either convert world->screen space or to control the size) float m_worldXScale; // 0x18 - // likely a y-offset of the race map in world space - float m_worldYOffset; // 0x1c - // inversely scales the map in y direction (either convert world->screen space or to control the size) - float m_worldYScale; // 0x20 + // likely a z-offset of the race map in world space + float m_worldZOffset; // 0x1c + // inversely scales the map in z direction (either convert world->screen space or to control the size) + float m_worldZScale; // 0x20 // scales the map in x direction (either convert world->screen space or to change the size) float m_screenXScale; // 0x24 // scales the map in y direction (either convert world->screen space or to change the size) diff --git a/LEGO1/lego/legoomni/src/race/legoracemap.cpp b/LEGO1/lego/legoomni/src/race/legoracemap.cpp index 9ac0f821..cbc1cbb2 100644 --- a/LEGO1/lego/legoomni/src/race/legoracemap.cpp +++ b/LEGO1/lego/legoomni/src/race/legoracemap.cpp @@ -64,12 +64,12 @@ void LegoRaceMap::ParseAction(char* p_extra) token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_worldYOffset = atof(token); + m_worldZOffset = atof(token); } token = strtok(NULL, g_parseExtraTokens); if (token != NULL) { - m_worldYScale = atof(token); + m_worldZScale = atof(token); } token = strtok(NULL, g_parseExtraTokens); @@ -110,7 +110,7 @@ void LegoRaceMap::UpdateMapLocatorPosition() { if (m_mapEnabled) { short xPos = (GetWorldPosition()[0] - m_worldXOffset) / m_worldXScale * m_screenXScale; - short yPos = (GetWorldPosition()[2] - m_worldYOffset) / m_worldYScale * m_screenYScale; + short yPos = (GetWorldPosition()[2] - m_worldZOffset) / m_worldZScale * m_screenYScale; m_stillPresenter->SetPosition(xPos + m_screenXOffset, m_screenYOffset - yPos); }