Merge branch 'isledecomp:master' into psp

CMakeLists.txt

@@ -537,7 +537,7 @@ endif()
 if (ISLE_BUILD_CONFIG)
   find_package(Qt6 REQUIRED COMPONENTS Core Widgets)
   qt_standard_project_setup()
-  qt_add_executable(config WIN32
+  qt_add_executable(isle-config WIN32
     LEGO1/mxdirectx/mxdirectxinfo.cpp
     LEGO1/mxdirectx/legodxinfo.cpp
     CONFIG/config.cpp
@@ -547,22 +547,22 @@ if (ISLE_BUILD_CONFIG)
     CONFIG/res/config.rc
     CONFIG/res/config.qrc
   )
-  target_link_libraries(config PRIVATE Qt6::Core Qt6::Widgets)
+  target_link_libraries(isle-config PRIVATE Qt6::Core Qt6::Widgets)
-  set_property(TARGET config PROPERTY AUTOMOC ON)
+  set_property(TARGET isle-config PROPERTY AUTOMOC ON)
-  set_property(TARGET config PROPERTY AUTORCC ON)
+  set_property(TARGET isle-config PROPERTY AUTORCC ON)
-  set_property(TARGET config PROPERTY AUTOUIC ON)
+  set_property(TARGET isle-config PROPERTY AUTOUIC ON)
-  set_property(TARGET config PROPERTY AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/CONFIG/res")
+  set_property(TARGET isle-config PROPERTY AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/CONFIG/res")
-  list(APPEND isle_targets config)
+  list(APPEND isle_targets isle-config)
-  target_compile_definitions(config PRIVATE _AFXDLL MXDIRECTX_FOR_CONFIG)
+  target_compile_definitions(isle-config PRIVATE _AFXDLL MXDIRECTX_FOR_CONFIG)
-  target_include_directories(config PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/LEGO1")
+  target_include_directories(isle-config PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/LEGO1")
-  target_include_directories(config PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/util>")
+  target_include_directories(isle-config PUBLIC "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/util>")
   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
-    target_link_libraries(config PRIVATE DirectX5::DirectX5)
+    target_link_libraries(isle-config PRIVATE DirectX5::DirectX5)
   endif()
-  target_compile_definitions(config PRIVATE DIRECT3D_VERSION=0x500)
+  target_compile_definitions(isle-config PRIVATE DIRECT3D_VERSION=0x500)
-  target_link_libraries(config PRIVATE SDL3::SDL3 Isle::iniparser)
+  target_link_libraries(isle-config PRIVATE SDL3::SDL3 Isle::iniparser)
   if (NOT ISLE_MINIWIN)
-    target_link_libraries(config PRIVATE ddraw dxguid)
+    target_link_libraries(isle-config PRIVATE ddraw dxguid)
   endif()
 endif()
 
@@ -576,8 +576,8 @@ if (MSVC)
     if (TARGET isle)
       target_compile_definitions(isle PRIVATE "_CRT_SECURE_NO_WARNINGS")
     endif()
-    if (TARGET config)
+    if (TARGET isle-config)
-      target_compile_definitions(config PRIVATE "_CRT_SECURE_NO_WARNINGS")
+      target_compile_definitions(isle-config PRIVATE "_CRT_SECURE_NO_WARNINGS")
     endif()
   endif()
   # Visual Studio 2017 version 15.7 needs "/Zc:__cplusplus" for __cplusplus
@@ -586,8 +586,8 @@ if (MSVC)
     if (TARGET isle)
       target_compile_options(isle PRIVATE "-Zc:__cplusplus")
     endif()
-    if (TARGET config)
+    if (TARGET isle-config)
-      target_compile_options(config PRIVATE "-Zc:__cplusplus")
+      target_compile_options(isle-config PRIVATE "-Zc:__cplusplus")
     endif()
   endif()
 endif()
@@ -645,7 +645,7 @@ install(TARGETS isle ${install_extra_targets}
   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 )
 if (ISLE_BUILD_CONFIG)
-  install(TARGETS config
+  install(TARGETS isle-config
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
   )
 endif()

CONFIG/MainDlg.cpp

@@ -11,6 +11,8 @@
 #include "res/resource.h"
 
 #include <QKeyEvent>
+#include <QMessageBox>
+#include <QProcess>
 #include <mxdirectx/legodxinfo.h>
 #include <ui_maindialog.h>
 
@@ -59,6 +61,7 @@ CMainDialog::CMainDialog(QWidget* pParent) : QDialog(pParent)
 	connect(m_ui->fullscreenCheckBox, &QCheckBox::toggled, this, &CMainDialog::OnCheckboxFullscreen);
 	connect(m_ui->okButton, &QPushButton::clicked, this, &CMainDialog::accept);
 	connect(m_ui->cancelButton, &QPushButton::clicked, this, &CMainDialog::reject);
+	connect(m_ui->launchButton, &QPushButton::clicked, this, &CMainDialog::launch);
 
 	connect(m_ui->dataPathOpen, &QPushButton::clicked, this, &CMainDialog::SelectDataPathDialog);
 	connect(m_ui->savePathOpen, &QPushButton::clicked, this, &CMainDialog::SelectSavePathDialog);
@@ -155,6 +158,30 @@ void CMainDialog::accept()
 	QDialog::accept();
 }
 
+void CMainDialog::launch()
+{
+	if (m_modified) {
+		currentConfigApp->WriteRegisterSettings();
+	}
+
+	QDir::setCurrent(QCoreApplication::applicationDirPath());
+
+	QMessageBox msgBox = QMessageBox(
+		QMessageBox::Warning,
+		QString("Error!"),
+		QString("Unable to locate isle executable!"),
+		QMessageBox::Close
+	);
+
+	if (!QProcess::startDetached("./isle")) {   // Check in isle-config directory
+		if (!QProcess::startDetached("isle")) { // Check in $PATH
+			msgBox.exec();
+		}
+	}
+
+	QDialog::accept();
+}
+
 // FUNCTION: CONFIG 0x00404360
 void CMainDialog::UpdateInterface()
 {

CONFIG/MainDlg.h

@@ -45,6 +45,7 @@ private slots:
 	void OnCheckboxFullscreen(bool checked);
 	void accept() override;
 	void reject() override;
+	void launch();
 	void SelectDataPathDialog();
 	void SelectSavePathDialog();
 	void DataPathEdited();

CONFIG/res/maindialog.ui

@@ -508,8 +508,11 @@
          </property>
          <item>
           <widget class="QPushButton" name="okButton">
+           <property name="toolTip">
+            <string>Save configuration and close the config tool.</string>
+           </property>
            <property name="text">
-            <string>OK</string>
+            <string>Save and Exit</string>
            </property>
            <property name="default">
             <bool>true</bool>
@@ -517,9 +520,22 @@
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="cancelButton">
+          <widget class="QPushButton" name="launchButton">
+           <property name="toolTip">
+            <string>Save configuration and launch LEGO Island.</string>
+           </property>
            <property name="text">
-            <string>Cancel</string>
+            <string>Save and Launch</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="cancelButton">
+           <property name="toolTip">
+            <string>Discard changed settings and close the config tool.</string>
+           </property>
+           <property name="text">
+            <string>Exit without saving</string>
            </property>
           </widget>
          </item>

ISLE/emscripten/libwasmfs_fetch.js.patch

@@ -1,5 +1,5 @@
 diff --git a/src/lib/libwasmfs_fetch.js b/src/lib/libwasmfs_fetch.js
-index e8c9f7e21..1c0eea957 100644
+index e8c9f7e21..caf1971d2 100644
 --- a/src/lib/libwasmfs_fetch.js
 +++ b/src/lib/libwasmfs_fetch.js
 @@ -38,36 +38,7 @@ addToLibrary({
@@ -89,7 +89,21 @@ index e8c9f7e21..1c0eea957 100644
        return Promise.resolve();
      }
  
-@@ -164,6 +156,21 @@ addToLibrary({
+@@ -156,14 +148,31 @@ addToLibrary({
+         return readLength;
+       },
+       getSize: async (file) => {
+-        try {
+-          await getFileRange(file, 0, 0);
+-        } catch (failedResponse) {
+-          return 0;
++        if (!(file in wasmFS$JSMemoryRanges)) {
++          try {
++            await getFileRange(file, undefined, undefined);
++          } catch (failedResponse) {
++            return 0;
++          }
+         }
          return wasmFS$JSMemoryRanges[file].size;
        },
      };

ISLE/isleapp.cpp

@@ -703,6 +703,7 @@ MxResult IsleApp::SetupWindow()
 		return FAILURE;
 	}
 
+	DetectGameVersion();
 	GameState()->SerializePlayersInfo(LegoStorage::c_read);
 	GameState()->SerializeScoreHistory(LegoStorage::c_read);
 
@@ -1098,6 +1099,34 @@ MxResult IsleApp::VerifyFilesystem()
 	return SUCCESS;
 }
 
+void IsleApp::DetectGameVersion()
+{
+	const char* file = "/lego/scripts/infocntr/infomain.si";
+	SDL_PathInfo info;
+	bool success = false;
+
+	MxString path = MxString(m_hdPath) + file;
+	path.MapPathToFilesystem();
+	if (!(success = SDL_GetPathInfo(path.GetData(), &info))) {
+		path = MxString(m_cdPath) + file;
+		path.MapPathToFilesystem();
+		success = SDL_GetPathInfo(path.GetData(), &info);
+	}
+
+	assert(success);
+
+	// File sizes of INFOMAIN.SI in English 1.0 and Japanese 1.0
+	Lego()->SetVersion10(info.size == 58130432 || info.size == 57737216);
+
+	if (Lego()->IsVersion10()) {
+		SDL_Log("Detected game version 1.0");
+		SDL_SetWindowTitle(reinterpret_cast<SDL_Window*>(m_windowHandle), "Lego Island");
+	}
+	else {
+		SDL_Log("Detected game version 1.1");
+	}
+}
+
 IDirect3DRMMiniwinDevice* GetD3DRMMiniwinDevice()
 {
 	LegoVideoManager* videoManager = LegoOmni::GetInstance()->GetVideoManager();

ISLE/isleapp.h

@@ -56,6 +56,7 @@ class IsleApp {
 
 	MxResult ParseArguments(int argc, char** argv);
 	MxResult VerifyFilesystem();
+	void DetectGameVersion();
 
 private:
 	char* m_hdPath;              // 0x00

LEGO1/lego/legoomni/include/ambulance.h

@@ -11,6 +11,12 @@ class MxEndActionNotificationParam;
 // SIZE 0x24
 class AmbulanceMissionState : public LegoState {
 public:
+	enum {
+		e_ready = 0,
+		e_enteredAmbulance = 1,
+		e_prepareAmbulance = 2,
+	};
+
 	AmbulanceMissionState();
 
 	// FUNCTION: LEGO1 0x10037440
@@ -125,18 +131,18 @@ class AmbulanceMissionState : public LegoState {
 	// SYNTHETIC: LEGO1 0x100376c0
 	// AmbulanceMissionState::`scalar deleting destructor'
 
-	undefined4 m_unk0x08; // 0x08
+	MxU32 m_state;       // 0x08
-	MxLong m_startTime;   // 0x0c
+	MxLong m_startTime;  // 0x0c
-	MxS16 m_peScore;      // 0x10
+	MxS16 m_peScore;     // 0x10
-	MxS16 m_maScore;      // 0x12
+	MxS16 m_maScore;     // 0x12
-	MxS16 m_paScore;      // 0x14
+	MxS16 m_paScore;     // 0x14
-	MxS16 m_niScore;      // 0x16
+	MxS16 m_niScore;     // 0x16
-	MxS16 m_laScore;      // 0x18
+	MxS16 m_laScore;     // 0x18
-	MxS16 m_peHighScore;  // 0x1a
+	MxS16 m_peHighScore; // 0x1a
-	MxS16 m_maHighScore;  // 0x1c
+	MxS16 m_maHighScore; // 0x1c
-	MxS16 m_paHighScore;  // 0x1e
+	MxS16 m_paHighScore; // 0x1e
-	MxS16 m_niHighScore;  // 0x20
+	MxS16 m_niHighScore; // 0x20
-	MxS16 m_laHighScore;  // 0x22
+	MxS16 m_laHighScore; // 0x22
 };
 
 // VTABLE: LEGO1 0x100d71a8
@@ -177,15 +183,21 @@ class Ambulance : public IslePathActor {
 	virtual MxLong HandleEndAction(MxEndActionNotificationParam& p_param);         // vtable+0xf4
 
 	void CreateState();
-	void FUN_10036e60();
+	void Init();
 	void ActivateSceneActions();
 	void StopActions();
-	void FUN_10037250();
+	void Reset();
 
 	// SYNTHETIC: LEGO1 0x10036130
 	// Ambulance::`scalar deleting destructor'
 
 private:
+	enum {
+		e_none = 0,
+		e_waiting = 1,
+		e_finished = 3,
+	};
+
 	void PlayAnimation(IsleScript::Script p_objectId);
 	void PlayFinalAnimation(IsleScript::Script p_objectId);
 	void StopAction(IsleScript::Script p_objectId);
@@ -196,9 +208,9 @@ class Ambulance : public IslePathActor {
 	AmbulanceMissionState* m_state;     // 0x164
 	MxS16 m_unk0x168;                   // 0x168
 	MxS16 m_actorId;                    // 0x16a
-	MxS16 m_unk0x16c;                   // 0x16c
+	MxS16 m_atPoliceTask;               // 0x16c
-	MxS16 m_unk0x16e;                   // 0x16e
+	MxS16 m_atBeachTask;                // 0x16e
-	MxS16 m_unk0x170;                   // 0x170
+	MxS16 m_taskState;                  // 0x170
 	MxS16 m_unk0x172;                   // 0x172
 	IsleScript::Script m_lastAction;    // 0x174
 	IsleScript::Script m_lastAnimation; // 0x178

LEGO1/lego/legoomni/include/legomain.h

@@ -200,6 +200,9 @@ class LegoOmni : public MxOmni {
 		SDL_PushEvent(&event);
 	}
 
+	void SetVersion10(MxBool p_version10) { m_version10 = p_version10; }
+	MxBool IsVersion10() { return m_version10; }
+
 	// SYNTHETIC: LEGO1 0x10058b30
 	// LegoOmni::`scalar deleting destructor'
 
@@ -221,6 +224,7 @@ class LegoOmni : public MxOmni {
 	MxDSAction m_action;                         // 0xa0
 	MxBackgroundAudioManager* m_bkgAudioManager; // 0x134
 	MxTransitionManager* m_transitionManager;    // 0x138
+	MxBool m_version10;
 
 public:
 	MxBool m_unk0x13c; // 0x13c

LEGO1/lego/legoomni/include/legopathactor.h

@@ -13,7 +13,7 @@ struct LegoPathEdgeContainer;
 struct LegoOrientedEdge;
 class LegoWEEdge;
 
-extern MxLong g_unk0x100f3308;
+extern MxLong g_timeLastHitSoundPlayed;
 extern const char* g_strHIT_WALL_SOUND;
 
 // VTABLE: LEGO1 0x100d6e28

LEGO1/lego/legoomni/include/legoplantmanager.h

@@ -54,7 +54,7 @@ class LEGO1_EXPORT LegoPlantManager : public MxCore {
 	LegoEntity* CreatePlant(MxS32 p_index, LegoWorld* p_world, LegoOmni::World p_worldId);
 	MxBool DecrementCounter(LegoEntity* p_entity);
 	void ScheduleAnimation(LegoEntity* p_entity, MxLong p_length);
-	MxResult FUN_10026410();
+	MxResult DetermineBoundaries();
 	void ClearCounters();
 	void SetInitialCounters();
 
@@ -77,11 +77,11 @@ class LEGO1_EXPORT LegoPlantManager : public MxCore {
 	static MxS32 g_maxMove[4];
 	static MxU32 g_maxSound;
 
-	LegoOmni::World m_worldId; // 0x08
+	LegoOmni::World m_worldId;     // 0x08
-	undefined m_unk0x0c;       // 0x0c
+	MxBool m_boundariesDetermined; // 0x0c
-	AnimEntry* m_entries[5];   // 0x10
+	AnimEntry* m_entries[5];       // 0x10
-	MxS8 m_numEntries;         // 0x24
+	MxS8 m_numEntries;             // 0x24
-	LegoWorld* m_world;        // 0x28
+	LegoWorld* m_world;            // 0x28
 
 	friend class DebugViewer;
 };

LEGO1/lego/legoomni/include/legoracers.h

@@ -144,10 +144,10 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
 	MxResult VTable0x9c() override; // vtable+0x9c
 
 	virtual void SetMaxLinearVelocity(float p_maxLinearVelocity);
-	virtual void FUN_10012ff0(float p_param);
+	virtual void KickCamera(float p_param);
 	virtual MxU32 HandleSkeletonKicks(float p_param1);
 
-	static void FUN_10012de0();
+	static void InitYouCantStopSound();
 	static void InitSoundIndices();
 
 	// SYNTHETIC: LEGO1 0x10014240
@@ -155,7 +155,7 @@ class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
 
 private:
 	undefined m_userState;    // 0x54
-	float m_unk0x58;          // 0x58
+	float m_kickStart;        // 0x58
 	Mx3DPointFloat m_unk0x5c; // 0x5c
 
 	// Names verified by BETA10 0x100cb4a9

LEGO1/lego/legoomni/include/legoracespecial.h

@@ -44,8 +44,11 @@ class LegoCarRaceActor : public virtual LegoRaceActor {
 		Vector3& p_v3
 	) override;                          // vtable+0x6c
 	void Animate(float p_time) override; // vtable+0x70
-	void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoOrientedEdge*& p_edge, float& p_unk0xe4)
+	void SwitchBoundary(
-		override;                   // vtable+0x98
+		LegoPathBoundary*& p_boundary,
+		LegoOrientedEdge*& p_edge,
+		float& p_unk0xe4
+	) override;                     // vtable+0x98
 	MxResult VTable0x9c() override; // vtable+0x9c
 
 	// LegoCarRaceActor vtable
@@ -83,7 +86,7 @@ class LegoCarRaceActor : public virtual LegoRaceActor {
 
 protected:
 	MxFloat m_unk0x08; // 0x08
-	MxU8 m_unk0x0c;    // 0x0c
+	MxU8 m_animState;  // 0x0c
 
 	// Could be a multiplier for the maximum speed when going straight
 	MxFloat m_unk0x10; // 0x10

LEGO1/lego/legoomni/src/actors/ambulance.cpp

@@ -40,9 +40,9 @@ Ambulance::Ambulance()
 	m_state = NULL;
 	m_unk0x168 = 0;
 	m_actorId = -1;
-	m_unk0x16c = 0;
+	m_atPoliceTask = 0;
-	m_unk0x16e = 0;
+	m_atBeachTask = 0;
-	m_unk0x170 = 0;
+	m_taskState = Ambulance::e_none;
 	m_lastAction = IsleScript::c_noneIsle;
 	m_unk0x172 = 0;
 	m_lastAnimation = IsleScript::c_noneIsle;
@@ -73,7 +73,7 @@ MxResult Ambulance::Create(MxDSAction& p_dsAction)
 		m_state = (AmbulanceMissionState*) GameState()->GetState("AmbulanceMissionState");
 		if (!m_state) {
 			m_state = new AmbulanceMissionState();
-			m_state->m_unk0x08 = 0;
+			m_state->m_state = AmbulanceMissionState::e_ready;
 			GameState()->RegisterState(m_state);
 		}
 	}
@@ -173,25 +173,25 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
 			m_lastAction = IsleScript::c_noneIsle;
 		}
 		else if (objectId == IsleScript::c_hho027en_RunAnim) {
-			m_state->m_unk0x08 = 1;
+			m_state->m_state = AmbulanceMissionState::e_enteredAmbulance;
 			CurrentWorld()->PlaceActor(UserActor());
 			HandleClick();
 			m_unk0x172 = 0;
 			TickleManager()->RegisterClient(this, 40000);
 		}
 		else if (objectId == IsleScript::c_hpz047pe_RunAnim || objectId == IsleScript::c_hpz048pe_RunAnim || objectId == IsleScript::c_hpz049bd_RunAnim || objectId == IsleScript::c_hpz053pa_RunAnim) {
-			if (m_unk0x170 == 3) {
+			if (m_taskState == Ambulance::e_finished) {
 				PlayAnimation(IsleScript::c_hpz055pa_RunAnim);
-				m_unk0x170 = 0;
+				m_taskState = Ambulance::e_none;
 			}
 			else {
 				PlayAnimation(IsleScript::c_hpz053pa_RunAnim);
 			}
 		}
 		else if (objectId == IsleScript::c_hpz050bd_RunAnim || objectId == IsleScript::c_hpz052ma_RunAnim) {
-			if (m_unk0x170 == 3) {
+			if (m_taskState == Ambulance::e_finished) {
 				PlayAnimation(IsleScript::c_hpz057ma_RunAnim);
-				m_unk0x170 = 0;
+				m_taskState = Ambulance::e_none;
 			}
 			else {
 				PlayAnimation(IsleScript::c_hpz052ma_RunAnim);
@@ -204,18 +204,18 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
 			m_unk0x172 = 0;
 			TickleManager()->RegisterClient(this, 40000);
 
-			if (m_unk0x16c != 0) {
+			if (m_atPoliceTask != 0) {
 				StopActions();
 			}
 		}
 		else if (objectId == IsleScript::c_hps116bd_RunAnim || objectId == IsleScript::c_hps118re_RunAnim) {
-			if (objectId == IsleScript::c_hps116bd_RunAnim && m_unk0x170 != 3) {
+			if (objectId == IsleScript::c_hps116bd_RunAnim && m_taskState != Ambulance::e_finished) {
 				PlayAction(IsleScript::c_Avo923In_PlayWav);
 			}
 
-			if (m_unk0x170 == 3) {
+			if (m_taskState == Ambulance::e_finished) {
 				PlayAnimation(IsleScript::c_hps117bd_RunAnim);
-				m_unk0x170 = 0;
+				m_taskState = Ambulance::e_none;
 			}
 			else {
 				PlayAnimation(IsleScript::c_hps118re_RunAnim);
@@ -228,12 +228,12 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
 			m_unk0x172 = 0;
 			TickleManager()->RegisterClient(this, 40000);
 
-			if (m_unk0x16e != 0) {
+			if (m_atBeachTask != 0) {
 				StopActions();
 			}
 		}
 		else if (objectId == IsleScript::c_hho142cl_RunAnim || objectId == IsleScript::c_hho143cl_RunAnim || objectId == IsleScript::c_hho144cl_RunAnim) {
-			FUN_10037250();
+			Reset();
 		}
 	}
 
@@ -244,18 +244,18 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
 // FUNCTION: BETA10 0x100230bf
 MxLong Ambulance::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
 {
-	if (m_unk0x170 == 1) {
+	if (m_taskState == Ambulance::e_waiting) {
 		LegoROI* roi = PickROI(p_param.GetX(), p_param.GetY());
 
 		if (roi != NULL && !SDL_strcasecmp(roi->GetName(), "ps-gate")) {
-			m_unk0x170 = 3;
+			m_taskState = Ambulance::e_finished;
 			return 1;
 		}
 
 		roi = PickRootROI(p_param.GetX(), p_param.GetY());
 
 		if (roi != NULL && !SDL_strcasecmp(roi->GetName(), "gd")) {
-			m_unk0x170 = 3;
+			m_taskState = Ambulance::e_finished;
 			return 1;
 		}
 	}
@@ -273,9 +273,9 @@ MxLong Ambulance::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 	}
 
 	if (p_param.GetTrigger() == LegoPathStruct::c_camAnim && p_param.GetData() == 0x0b) {
-		if (m_unk0x16e != 0) {
+		if (m_atBeachTask != 0) {
-			if (m_unk0x16c != 0) {
+			if (m_atPoliceTask != 0) {
-				m_state->m_unk0x08 = 2;
+				m_state->m_state = AmbulanceMissionState::e_prepareAmbulance;
 
 				if (m_lastAction != IsleScript::c_noneIsle) {
 					InvokeAction(Extra::e_stop, *g_isleScript, m_lastAction, NULL);
@@ -300,7 +300,7 @@ MxLong Ambulance::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 				return 0;
 			}
 
-			if (m_unk0x16e != 0) {
+			if (m_atBeachTask != 0) {
 				if (m_lastAction != IsleScript::c_noneIsle) {
 					InvokeAction(Extra::e_stop, *g_isleScript, m_lastAction, NULL);
 				}
@@ -310,7 +310,7 @@ MxLong Ambulance::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 			}
 		}
 
-		if (m_unk0x16c != 0) {
+		if (m_atPoliceTask != 0) {
 			if (m_lastAction != IsleScript::c_noneIsle) {
 				InvokeAction(Extra::e_stop, *g_isleScript, m_lastAction, NULL);
 			}
@@ -318,9 +318,9 @@ MxLong Ambulance::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 			PlayAction(IsleScript::c_Avo915In_PlayWav);
 		}
 	}
-	else if (p_param.GetTrigger() == LegoPathStruct::c_s && p_param.GetData() == 0x131 && m_unk0x16e == 0) {
+	else if (p_param.GetTrigger() == LegoPathStruct::c_s && p_param.GetData() == 0x131 && m_atBeachTask == 0) {
-		m_unk0x16e = 1;
+		m_atBeachTask = 1;
-		m_unk0x170 = 1;
+		m_taskState = Ambulance::e_waiting;
 
 		if (m_lastAction != IsleScript::c_noneIsle) {
 			InvokeAction(Extra::e_stop, *g_isleScript, m_lastAction, NULL);
@@ -348,9 +348,9 @@ MxLong Ambulance::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 			break;
 		}
 	}
-	else if (p_param.GetTrigger() == LegoPathStruct::c_camAnim && (p_param.GetData() == 0x22 || p_param.GetData() == 0x23 || p_param.GetData() == 0x24) && m_unk0x16c == 0) {
+	else if (p_param.GetTrigger() == LegoPathStruct::c_camAnim && (p_param.GetData() == 0x22 || p_param.GetData() == 0x23 || p_param.GetData() == 0x24) && m_atPoliceTask == 0) {
-		m_unk0x16c = 1;
+		m_atPoliceTask = 1;
-		m_unk0x170 = 1;
+		m_taskState = Ambulance::e_waiting;
 
 		if (m_lastAction != IsleScript::c_noneIsle) {
 			InvokeAction(Extra::e_stop, *g_isleScript, m_lastAction, NULL);
@@ -371,7 +371,7 @@ MxLong Ambulance::HandleClick()
 		return 1;
 	}
 
-	if (m_state->m_unk0x08 == 2) {
+	if (m_state->m_state == AmbulanceMissionState::e_prepareAmbulance) {
 		return 1;
 	}
 
@@ -390,7 +390,7 @@ MxLong Ambulance::HandleClick()
 	InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_AmbulanceDashboard, NULL);
 	ControlManager()->Register(this);
 
-	if (m_state->m_unk0x08 == 1) {
+	if (m_state->m_state == AmbulanceMissionState::e_enteredAmbulance) {
 		SpawnPlayer(LegoGameState::e_hospitalExited, TRUE, 0);
 		m_state->m_startTime = Timer()->GetTime();
 		InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_pns018rd_RunAnim, NULL);
@@ -401,9 +401,9 @@ MxLong Ambulance::HandleClick()
 
 // FUNCTION: LEGO1 0x10036e60
 // FUNCTION: BETA10 0x100236bb
-void Ambulance::FUN_10036e60()
+void Ambulance::Init()
 {
-	m_state->m_unk0x08 = 2;
+	m_state->m_state = AmbulanceMissionState::e_prepareAmbulance;
 	PlayAnimation(IsleScript::c_hho027en_RunAnim);
 	m_lastAction = IsleScript::c_noneIsle;
 	m_lastAnimation = IsleScript::c_noneIsle;
@@ -414,7 +414,7 @@ void Ambulance::Exit()
 {
 	GameState()->m_currentArea = LegoGameState::e_hospitalExterior;
 	StopActions();
-	FUN_10037250();
+	Reset();
 	Leave();
 }
 
@@ -470,11 +470,11 @@ void Ambulance::ActivateSceneActions()
 {
 	PlayMusic(JukeboxScript::c_Hospital_Music);
 
-	if (m_state->m_unk0x08 == 1) {
+	if (m_state->m_state == AmbulanceMissionState::e_enteredAmbulance) {
-		m_state->m_unk0x08 = 0;
+		m_state->m_state = AmbulanceMissionState::e_ready;
 		PlayAction(IsleScript::c_ham033cl_PlayWav);
 	}
-	else if (m_unk0x16c != 0 && m_unk0x16e != 0) {
+	else if (m_atPoliceTask != 0 && m_atBeachTask != 0) {
 		IsleScript::Script objectId;
 
 		switch (SDL_rand(2)) {
@@ -574,14 +574,14 @@ void Ambulance::StopActions()
 }
 
 // FUNCTION: LEGO1 0x10037250
-void Ambulance::FUN_10037250()
+void Ambulance::Reset()
 {
 	StopAction(m_lastAction);
 	BackgroundAudioManager()->RaiseVolume();
 	((Act1State*) GameState()->GetState("Act1State"))->m_unk0x018 = 0;
-	m_state->m_unk0x08 = 0;
+	m_state->m_state = AmbulanceMissionState::e_ready;
-	m_unk0x16e = 0;
+	m_atBeachTask = 0;
-	m_unk0x16c = 0;
+	m_atPoliceTask = 0;
 	g_isleFlags |= Isle::c_playMusic;
 	AnimationManager()->EnableCamAnims(TRUE);
 	AnimationManager()->FUN_1005f6d0(TRUE);
@@ -629,7 +629,7 @@ void Ambulance::PlayAction(IsleScript::Script p_objectId)
 // FUNCTION: LEGO1 0x100373a0
 AmbulanceMissionState::AmbulanceMissionState()
 {
-	m_unk0x08 = 0;
+	m_state = AmbulanceMissionState::e_ready;
 	m_startTime = 0;
 	m_peScore = 0;
 	m_maScore = 0;

LEGO1/lego/legoomni/src/build/legocarbuild.cpp

@@ -488,7 +488,7 @@ void LegoCarBuild::FUN_100236d0()
 	m_unk0x110 = NULL;
 	m_unk0x100 = 0;
 
-	if (m_animPresenter->AllPartsPlaced()) {
+	if (m_animPresenter->AllPartsPlaced() && !Lego()->IsVersion10()) {
 		// Note the code duplication with LEGO1 0x10025ee0
 		switch (m_carId) {
 		case 1:

LEGO1/lego/legoomni/src/common/legocharactermanager.cpp

@@ -636,7 +636,7 @@ MxBool LegoCharacterManager::SetHeadTexture(LegoROI* p_roi, LegoTextureInfo* p_t
 			LegoLOD* clone = lod->Clone(renderer);
 
 			if (p_texture != NULL) {
-				clone->FUN_100aad70(p_texture);
+				clone->UpdateTextureInfo(p_texture);
 			}
 
 			dupLodList->PushBack(clone);

LEGO1/lego/legoomni/src/common/legoplantmanager.cpp

@@ -83,7 +83,7 @@ void LegoPlantManager::Init()
 	}
 
 	m_worldId = LegoOmni::e_undefined;
-	m_unk0x0c = 0;
+	m_boundariesDetermined = FALSE;
 	m_numEntries = 0;
 }
 
@@ -98,7 +98,7 @@ void LegoPlantManager::LoadWorldInfo(LegoOmni::World p_worldId)
 		CreatePlant(i, world, p_worldId);
 	}
 
-	m_unk0x0c = 0;
+	m_boundariesDetermined = FALSE;
 }
 
 // FUNCTION: LEGO1 0x100263a0
@@ -119,12 +119,12 @@ void LegoPlantManager::Reset(LegoOmni::World p_worldId)
 	}
 
 	m_worldId = LegoOmni::e_undefined;
-	m_unk0x0c = 0;
+	m_boundariesDetermined = FALSE;
 }
 
 // FUNCTION: LEGO1 0x10026410
 // FUNCTION: BETA10 0x100c50e9
-MxResult LegoPlantManager::FUN_10026410()
+MxResult LegoPlantManager::DetermineBoundaries()
 {
 	// similar to LegoBuildingManager::FUN_10030630()
 
@@ -192,7 +192,7 @@ MxResult LegoPlantManager::FUN_10026410()
 		}
 	}
 
-	m_unk0x0c = TRUE;
+	m_boundariesDetermined = TRUE;
 	return SUCCESS;
 }
 
@@ -200,8 +200,8 @@ MxResult LegoPlantManager::FUN_10026410()
 // FUNCTION: BETA10 0x100c55e0
 LegoPlantInfo* LegoPlantManager::GetInfoArray(MxS32& p_length)
 {
-	if (!m_unk0x0c) {
+	if (!m_boundariesDetermined) {
-		FUN_10026410();
+		DetermineBoundaries();
 	}
 
 	p_length = sizeOfArray(g_plantInfo);

LEGO1/lego/legoomni/src/main/legomain.cpp

@@ -76,6 +76,7 @@ void LegoOmni::Init()
 	m_bkgAudioManager = NULL;
 	m_unk0x13c = TRUE;
 	m_transitionManager = NULL;
+	m_version10 = FALSE;
 }
 
 // FUNCTION: LEGO1 0x10058c30

LEGO1/lego/legoomni/src/paths/legopathactor.cpp

@@ -37,7 +37,7 @@ const char* g_strHIT_WALL_SOUND = "HIT_WALL_SOUND";
 
 // GLOBAL: LEGO1 0x100f3308
 // GLOBAL: BETA10 0x101f1e1c
-MxLong g_unk0x100f3308 = 0;
+MxLong g_timeLastHitSoundPlayed = 0;
 
 // FUNCTION: LEGO1 0x1002d700
 // FUNCTION: BETA10 0x100ae6e0
@@ -292,8 +292,8 @@ MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
 				if (m_boundary == oldBoundary) {
 					MxLong time = Timer()->GetTime();
 
-					if (time - g_unk0x100f3308 > 1000) {
+					if (time - g_timeLastHitSoundPlayed > 1000) {
-						g_unk0x100f3308 = time;
+						g_timeLastHitSoundPlayed = time;
 						const char* var = VariableTable()->GetVariable(g_strHIT_WALL_SOUND);
 
 						if (var && var[0] != 0) {

LEGO1/lego/legoomni/src/race/carrace.cpp

@@ -246,7 +246,7 @@ MxLong CarRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 					VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
 					NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
 					NavController()->SetTrackDefault(1);
-					LegoRaceCar::FUN_10012de0();
+					LegoRaceCar::InitYouCantStopSound();
 					m_raceState->m_unk0x28 = 2;
 
 					RaceState::Entry* raceState = m_raceState->GetState(GameState()->GetActorId());
@@ -348,7 +348,7 @@ MxLong CarRace::HandleClick(LegoEventNotificationParam& p_param)
 			VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
 			NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
 			NavController()->SetTrackDefault(1);
-			LegoRaceCar::FUN_10012de0();
+			LegoRaceCar::InitYouCantStopSound();
 			m_destLocation = LegoGameState::e_infomain;
 			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
 			GameState()->GetBackgroundColor()->SetValue("reset");
@@ -360,7 +360,7 @@ MxLong CarRace::HandleClick(LegoEventNotificationParam& p_param)
 			VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
 			NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
 			NavController()->SetTrackDefault(1);
-			LegoRaceCar::FUN_10012de0();
+			LegoRaceCar::InitYouCantStopSound();
 			m_destLocation = LegoGameState::e_carraceExterior;
 			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
 			GameState()->GetBackgroundColor()->SetValue("reset");
@@ -424,7 +424,7 @@ MxBool CarRace::Escape()
 	NavController()->SetDeadZone(NavController()->GetDefaultDeadZone());
 
 	NavController()->SetTrackDefault(1);
-	LegoRaceCar::FUN_10012de0();
+	LegoRaceCar::InitYouCantStopSound();
 
 	GameState()->GetBackgroundColor()->SetValue("reset");
 	m_destLocation = LegoGameState::e_infomain;

LEGO1/lego/legoomni/src/race/jetskirace.cpp

@@ -132,7 +132,7 @@ MxLong JetskiRace::HandleClick(LegoEventNotificationParam& p_param)
 			m_act1State->m_unk0x018 = 0;
 			VariableTable()->SetVariable(g_raceState, "");
 			VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
-			LegoRaceCar::FUN_10012de0();
+			LegoRaceCar::InitYouCantStopSound();
 			m_destLocation = LegoGameState::e_jetraceExterior;
 			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
 			break;
@@ -140,7 +140,7 @@ MxLong JetskiRace::HandleClick(LegoEventNotificationParam& p_param)
 			m_act1State->m_unk0x018 = 0;
 			VariableTable()->SetVariable(g_raceState, "");
 			VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
-			LegoRaceCar::FUN_10012de0();
+			LegoRaceCar::InitYouCantStopSound();
 			m_destLocation = LegoGameState::e_infomain;
 			result = 1;
 			TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
@@ -193,7 +193,7 @@ MxLong JetskiRace::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 
 					VariableTable()->SetVariable(g_raceState, "");
 					VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
-					LegoRaceCar::FUN_10012de0();
+					LegoRaceCar::InitYouCantStopSound();
 					m_raceState->m_unk0x28 = 2;
 
 					RaceState::Entry* raceStateEntry = m_raceState->GetState(GameState()->GetActorId());
@@ -294,6 +294,6 @@ MxBool JetskiRace::Escape()
 	VariableTable()->SetVariable(g_raceState, "");
 	VariableTable()->SetVariable(g_strHIT_WALL_SOUND, "");
 	m_destLocation = LegoGameState::e_infomain;
-	LegoRaceCar::FUN_10012de0();
+	LegoRaceCar::InitYouCantStopSound();
 	return TRUE;
 }

LEGO1/lego/legoomni/src/race/legoraceactor.cpp

@@ -31,8 +31,8 @@ MxS32 LegoRaceActor::VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3)
 
 	if (m_userNavFlag && result) {
 		MxLong time = Timer()->GetTime();
-		if (time - g_unk0x100f3308 > 1000) {
+		if (time - g_timeLastHitSoundPlayed > 1000) {
-			g_unk0x100f3308 = time;
+			g_timeLastHitSoundPlayed = time;
 			const char* soundKey = VariableTable()->GetVariable(g_strHIT_ACTOR_SOUND);
 
 			if (soundKey && *soundKey) {

LEGO1/lego/legoomni/src/race/legoracers.cpp

@@ -178,7 +178,7 @@ LegoRaceCar::LegoRaceCar()
 	m_skelKick1Anim = 0;
 	m_skelKick2Anim = 0;
 	m_unk0x5c.Clear();
-	m_unk0x58 = 0;
+	m_kickStart = 0;
 	m_kick1B = 0;
 	m_kick2B = 0;
 	NotificationManager()->Register(this);
@@ -201,10 +201,10 @@ MxLong LegoRaceCar::Notify(MxParam& p_param)
 // Initialized at LEGO1 0x10012db0
 // GLOBAL: LEGO1 0x10102af0
 // GLOBAL: BETA10 0x102114c0
-Mx3DPointFloat g_unk0x10102af0 = Mx3DPointFloat(0.0f, 2.0f, 0.0f);
+Mx3DPointFloat g_hitOffset = Mx3DPointFloat(0.0f, 2.0f, 0.0f);
 
 // FUNCTION: LEGO1 0x10012de0
-void LegoRaceCar::FUN_10012de0()
+void LegoRaceCar::InitYouCantStopSound()
 {
 	// Init to TRUE so we don't play "you can't stop in the middle of the race!" before the player ever moves
 	g_playedYouCantStopSound = TRUE;
@@ -229,7 +229,7 @@ void LegoRaceCar::InitSoundIndices()
 void LegoRaceCar::SetWorldSpeed(MxFloat p_worldSpeed)
 {
 	if (!m_userNavFlag) {
-		if (!LegoCarRaceActor::m_unk0x0c) {
+		if (!LegoCarRaceActor::m_animState) {
 			m_maxLinearVel = p_worldSpeed;
 		}
 		LegoAnimActor::SetWorldSpeed(p_worldSpeed);
@@ -244,7 +244,7 @@ void LegoRaceCar::SetWorldSpeed(MxFloat p_worldSpeed)
 void LegoRaceCar::SetMaxLinearVelocity(float p_maxLinearVelocity)
 {
 	if (p_maxLinearVelocity < 0) {
-		LegoCarRaceActor::m_unk0x0c = 2;
+		LegoCarRaceActor::m_animState = 2;
 		m_maxLinearVel = 0;
 		SetWorldSpeed(0);
 	}
@@ -299,7 +299,7 @@ void LegoRaceCar::ParseAction(char* p_extra)
 
 // FUNCTION: LEGO1 0x10012ff0
 // FUNCTION: BETA10 0x100cb60e
-void LegoRaceCar::FUN_10012ff0(float p_param)
+void LegoRaceCar::KickCamera(float p_param)
 {
 	LegoAnimActorStruct* a; // called `a` in BETA10
 	float deltaTime;
@@ -315,7 +315,7 @@ void LegoRaceCar::FUN_10012ff0(float p_param)
 	assert(a && a->GetAnimTreePtr() && a->GetAnimTreePtr()->GetCamAnim());
 
 	if (a->GetAnimTreePtr()) {
-		deltaTime = p_param - m_unk0x58;
+		deltaTime = p_param - m_kickStart;
 
 		if (a->GetDuration() <= deltaTime || deltaTime < 0.0) {
 			if (m_userState == LEGORACECAR_KICK1) {
@@ -390,7 +390,7 @@ MxU32 LegoRaceCar::HandleSkeletonKicks(float p_param1)
 		return FALSE;
 	}
 
-	m_unk0x58 = p_param1;
+	m_kickStart = p_param1;
 	SoundManager()->GetCacheSoundManager()->Play(g_soundSkel3, NULL, FALSE);
 
 	return TRUE;
@@ -401,7 +401,7 @@ MxU32 LegoRaceCar::HandleSkeletonKicks(float p_param1)
 void LegoRaceCar::Animate(float p_time)
 {
 	if (m_userNavFlag && (m_userState == LEGORACECAR_KICK1 || m_userState == LEGORACECAR_KICK2)) {
-		FUN_10012ff0(p_time);
+		KickCamera(p_time);
 		return;
 	}
 
@@ -413,7 +413,7 @@ void LegoRaceCar::Animate(float p_time)
 		}
 	}
 
-	if (LegoCarRaceActor::m_unk0x0c == 1) {
+	if (LegoCarRaceActor::m_animState == 1) {
 		FUN_1005d4b0();
 
 		if (!m_userNavFlag) {
@@ -471,7 +471,7 @@ MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 			assert(roi);
 			matr = roi->GetLocal2World();
 
-			Vector3(matr[3]) += g_unk0x10102af0;
+			Vector3(matr[3]) += g_hitOffset;
 			roi->SetLocal2World(matr);
 
 			p_actor->SetActorState(c_two);
@@ -516,7 +516,7 @@ MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 
 				if (soundKey) {
 					SoundManager()->GetCacheSoundManager()->Play(soundKey, NULL, FALSE);
-					g_timeLastRaceCarSoundPlayed = g_unk0x100f3308 = time;
+					g_timeLastRaceCarSoundPlayed = g_timeLastHitSoundPlayed = time;
 				}
 			}
 
@@ -582,7 +582,7 @@ void LegoJetski::InitSoundIndices()
 void LegoJetski::SetWorldSpeed(MxFloat p_worldSpeed)
 {
 	if (!m_userNavFlag) {
-		if (!LegoCarRaceActor::m_unk0x0c) {
+		if (!LegoCarRaceActor::m_animState) {
 			m_maxLinearVel = p_worldSpeed;
 		}
 		LegoAnimActor::SetWorldSpeed(p_worldSpeed);
@@ -597,7 +597,7 @@ void LegoJetski::SetWorldSpeed(MxFloat p_worldSpeed)
 void LegoJetski::FUN_100136f0(float p_worldSpeed)
 {
 	if (p_worldSpeed < 0) {
-		LegoCarRaceActor::m_unk0x0c = 2;
+		LegoCarRaceActor::m_animState = 2;
 		m_maxLinearVel = 0;
 		SetWorldSpeed(0);
 	}
@@ -612,7 +612,7 @@ void LegoJetski::Animate(float p_time)
 {
 	LegoJetskiRaceActor::Animate(p_time);
 
-	if (LegoCarRaceActor::m_unk0x0c == 1) {
+	if (LegoCarRaceActor::m_animState == 1) {
 		FUN_1005d4b0();
 
 		if (!m_userNavFlag) {
@@ -685,7 +685,7 @@ MxResult LegoJetski::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 			LegoROI* roi = p_actor->GetROI();
 			matr = roi->GetLocal2World();
 
-			Vector3(matr[3]) += g_unk0x10102af0;
+			Vector3(matr[3]) += g_hitOffset;
 			roi->SetLocal2World(matr);
 
 			p_actor->SetActorState(c_two);
@@ -714,7 +714,7 @@ MxResult LegoJetski::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 
 				if (soundKey) {
 					SoundManager()->GetCacheSoundManager()->Play(soundKey, NULL, FALSE);
-					g_timeLastJetskiSoundPlayed = g_unk0x100f3308 = time;
+					g_timeLastJetskiSoundPlayed = g_timeLastHitSoundPlayed = time;
 				}
 			}
 

LEGO1/lego/legoomni/src/race/legoracespecial.cpp

@@ -45,7 +45,7 @@ LegoCarRaceActor::LegoCarRaceActor()
 {
 	m_unk0x08 = 1.0f;
 	m_unk0x70 = 0.0f;
-	m_unk0x0c = 0;
+	m_animState = 0;
 	m_maxLinearVel = 0.0f;
 	m_frequencyFactor = 1.0f;
 	m_unk0x1c = 0;
@@ -224,18 +224,18 @@ void LegoCarRaceActor::SwitchBoundary(LegoPathBoundary*& p_boundary, LegoOriente
 // FUNCTION: BETA10 0x100cdbae
 void LegoCarRaceActor::Animate(float p_time)
 {
-	// m_unk0x0c is not an MxBool, there are places where it is set to 2 or higher
+	// m_animState is not an MxBool, there are places where it is set to 2 or higher
-	if (m_unk0x0c == 0) {
+	if (m_animState == 0) {
 		const char* value = VariableTable()->GetVariable(g_raceState);
 
 		if (SDL_strcasecmp(value, g_racing) == 0) {
-			m_unk0x0c = 1;
+			m_animState = 1;
 			m_lastTime = p_time - 1.0f;
 			m_unk0x1c = p_time;
 		}
 	}
 
-	if (m_unk0x0c == 1) {
+	if (m_animState == 1) {
 		LegoAnimActor::Animate(p_time);
 	}
 }
@@ -399,10 +399,10 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 // FUNCTION: LEGO1 0x10081550
 void LegoJetskiRaceActor::Animate(float p_time)
 {
-	if (m_unk0x0c == 0) {
+	if (m_animState == 0) {
 		const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
 		if (!SDL_strcasecmp(raceState, g_racing)) {
-			m_unk0x0c = 1;
+			m_animState = 1;
 			m_lastTime = p_time - 1.0f;
 			m_unk0x1c = p_time;
 		}
@@ -411,7 +411,7 @@ void LegoJetskiRaceActor::Animate(float p_time)
 		}
 	}
 
-	if (m_unk0x0c == 1) {
+	if (m_animState == 1) {
 		LegoAnimActor::Animate(p_time);
 	}
 }

LEGO1/lego/legoomni/src/worlds/infocenter.cpp

@@ -306,29 +306,32 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
 
 		if (!m_unk0x1d4) {
 			PlayMusic(JukeboxScript::c_InformationCenter_Music);
-			GameState()->SetActor(m_selectedCharacter);
 
-			switch (m_selectedCharacter) {
+			if (!Lego()->IsVersion10()) {
-			case e_pepper:
+				GameState()->SetActor(m_selectedCharacter);
-				PlayAction(InfomainScript::c_avo901in_RunAnim);
+
-				break;
+				switch (m_selectedCharacter) {
-			case e_mama:
+				case e_pepper:
-				PlayAction(InfomainScript::c_avo902in_RunAnim);
+					PlayAction(InfomainScript::c_avo901in_RunAnim);
-				break;
+					break;
-			case e_papa:
+				case e_mama:
-				PlayAction(InfomainScript::c_avo903in_RunAnim);
+					PlayAction(InfomainScript::c_avo902in_RunAnim);
-				break;
+					break;
-			case e_nick:
+				case e_papa:
-				PlayAction(InfomainScript::c_avo904in_RunAnim);
+					PlayAction(InfomainScript::c_avo903in_RunAnim);
-				break;
+					break;
-			case e_laura:
+				case e_nick:
-				PlayAction(InfomainScript::c_avo905in_RunAnim);
+					PlayAction(InfomainScript::c_avo904in_RunAnim);
-				break;
+					break;
-			default:
+				case e_laura:
-				break;
+					PlayAction(InfomainScript::c_avo905in_RunAnim);
+					break;
+				default:
+					break;
+				}
+
+				UpdateFrameHot(TRUE);
 			}
-
-			UpdateFrameHot(TRUE);
 		}
 	}
 
@@ -338,7 +341,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
 		return result;
 	}
 
-	if (action->GetObjectId() == InfomainScript::c_iicx26in_RunAnim) {
+	if (action->GetObjectId() == InfomainScript::c_iicx26in_RunAnim - Lego()->IsVersion10()) {
 		ControlManager()->FUN_100293c0(InfomainScript::c_BigInfo_Ctl, action->GetAtomId().GetInternal(), 0);
 		m_unk0x1d6 = 0;
 	}
@@ -478,7 +481,7 @@ void Infocenter::ReadyWorld()
 			InfomainScript::Script script = m_infocenterState->GetNextReturnDialogue();
 			PlayAction(script);
 
-			if (script == InfomainScript::c_iicx26in_RunAnim) {
+			if (script == InfomainScript::c_iicx26in_RunAnim - Lego()->IsVersion10()) {
 				m_unk0x1d6 = 1;
 			}
 
@@ -1186,13 +1189,13 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
 				m_currentInfomainScript == InfomainScript::c_Pepper_All_Movie ||
 				m_currentInfomainScript == InfomainScript::c_Nick_All_Movie ||
 				m_currentInfomainScript == InfomainScript::c_Laura_All_Movie ||
-				m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav ||
+				m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav - Lego()->IsVersion10() ||
-				m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav) {
+				m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav - Lego()->IsVersion10()) {
 				StopCurrentAction();
 			}
 		}
@@ -1506,6 +1509,17 @@ void Infocenter::StopCredits()
 // FUNCTION: BETA10 0x1002ee8c
 void Infocenter::PlayAction(InfomainScript::Script p_script)
 {
+	if (Lego()->IsVersion10()) {
+		if (p_script == InfomainScript::c_iicx18in_RunAnim) {
+			// Alternative dialogue after signing in (1.0 version)
+			p_script = InfomainScript::c_iic016in_RunAnim;
+		}
+		else if (p_script > InfomainScript::c_iicx18in_RunAnim) {
+			// Shift all other actions by 1
+			p_script = (InfomainScript::Script)((int) p_script - 1);
+		}
+	}
+
 	MxDSAction action;
 	action.SetObjectId(p_script);
 	action.SetAtomId(*g_infomainScript);

LEGO1/lego/legoomni/src/worlds/isle.cpp

@@ -810,7 +810,7 @@ void Isle::Enable(MxBool p_enable)
 			AnimationManager()->EnableCamAnims(FALSE);
 
 			g_isleFlags &= ~c_playMusic;
-			m_ambulance->FUN_10036e60();
+			m_ambulance->Init();
 			break;
 		case 11:
 			m_act1state->m_unk0x018 = 0;
@@ -1209,7 +1209,7 @@ MxBool Isle::Escape()
 	case 10:
 		if (UserActor() != NULL && !UserActor()->IsA("Ambulance")) {
 			m_ambulance->StopActions();
-			m_ambulance->FUN_10037250();
+			m_ambulance->Reset();
 		}
 		break;
 	}
@@ -1250,7 +1250,7 @@ void Isle::FUN_10033350()
 	if (m_act1state->m_unk0x018 == 10) {
 		if (UserActor() != NULL && !UserActor()->IsA("Ambulance")) {
 			m_ambulance->StopActions();
-			m_ambulance->FUN_10037250();
+			m_ambulance->Reset();
 		}
 	}
 

LEGO1/lego/sources/roi/legolod.cpp

@@ -353,7 +353,7 @@ LegoResult LegoLOD::SetTextureInfo(LegoTextureInfo* p_textureInfo)
 }
 
 // FUNCTION: LEGO1 0x100aad70
-LegoResult LegoLOD::FUN_100aad70(LegoTextureInfo* p_textureInfo)
+LegoResult LegoLOD::UpdateTextureInfo(LegoTextureInfo* p_textureInfo)
 {
 	for (LegoU32 i = m_meshOffset; i < m_numMeshes; i++) {
 		if (m_melems[i].m_textured) {

LEGO1/lego/sources/roi/legolod.h

@@ -31,7 +31,7 @@ class LegoLOD : public ViewLOD {
 	LegoLOD* Clone(Tgl::Renderer* p_renderer);
 	LegoResult SetColor(LegoFloat p_red, LegoFloat p_green, LegoFloat p_blue, LegoFloat p_alpha);
 	LegoResult SetTextureInfo(LegoTextureInfo* p_textureInfo);
-	LegoResult FUN_100aad70(LegoTextureInfo* p_textureInfo);
+	LegoResult UpdateTextureInfo(LegoTextureInfo* p_textureInfo);
 	void ClearMeshOffset();
 	LegoResult GetTextureInfo(LegoTextureInfo*& p_textureInfo);
 

LEGO1/omni/include/mxstring.h

@@ -20,10 +20,10 @@ class MxString : public MxCore {
 	void ToLowerCase();
 	void MapPathToFilesystem() { MapPathToFilesystem(m_data); }
 
-	MxString& operator=(const MxString& p_str);
+	LEGO1_EXPORT MxString& operator=(const MxString& p_str);
-	const MxString& operator=(const char* p_str);
+	LEGO1_EXPORT const MxString& operator=(const char* p_str);
-	MxString operator+(const MxString& p_str) const;
+	LEGO1_EXPORT MxString operator+(const MxString& p_str) const;
-	MxString operator+(const char* p_str) const;
+	LEGO1_EXPORT MxString operator+(const char* p_str) const;
 	LEGO1_EXPORT MxString& operator+=(const char* p_str);
 
 	static void CharSwap(char* p_a, char* p_b);

miniwin/src/ddraw/ddraw.cpp

@@ -18,6 +18,7 @@
 
 #include <SDL3/SDL.h>
 #include <assert.h>
+#include <cinttypes>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
@@ -75,7 +76,7 @@ HRESULT DirectDrawImpl::CreateSurface(
 			if ((lpDDSurfaceDesc->dwFlags & DDSD_ZBUFFERBITDEPTH) != DDSD_ZBUFFERBITDEPTH) {
 				return DDERR_INVALIDPARAMS;
 			}
-			SDL_Log("Todo: Set %dbit Z-Buffer", lpDDSurfaceDesc->dwZBufferBitDepth);
+			SDL_Log("Todo: Set %" PRIu32 "bit Z-Buffer", lpDDSurfaceDesc->dwZBufferBitDepth);
 			*lplpDDSurface = static_cast<IDirectDrawSurface*>(new DummySurfaceImpl);
 			return DD_OK;
 		}