fix Ressource name (#596)

* fix Ressource name

* add a fallback

* use the correct name for dk jungle

* use the correct name for macos intel CI

* add print

19 files changed, 21 insertions, 5 deletions

diff --git a/src/engine/RaceManager.cpp b/src/engine/RaceManager.cpp
index c186add5e..03ad157e3 100644
--- a/src/engine/RaceManager.cpp
+++ b/src/engine/RaceManager.cpp
@@ -52,9 +52,10 @@ extern "C" void add_triangle_to_collision_mesh(Vtx* vtx1, Vtx* vtx2, Vtx* vtx3,
 }
 
 void RaceManager::Load() {
-    if (GetWorld()->GetTrack()) {
+    auto* track = GetWorld()->GetTrack();
+    if (track) {
         mirroredVtxCache.clear();
-        GetWorld()->GetTrack()->Load();
+        track->Load();
     } else {
         printf("[RaceManager] [Load] Track was nullptr\n");
     }
diff --git a/src/engine/TrackBrowser.cpp b/src/engine/TrackBrowser.cpp
index 7fd5dddad..184b416b1 100644
--- a/src/engine/TrackBrowser.cpp
+++ b/src/engine/TrackBrowser.cpp
@@ -26,6 +26,10 @@ void TrackBrowser::FindCustomTracks() {
             TrackInfo info;
             info.Path = dir;
             TrackEditor::LoadTrackInfo(info, archive, sceneFile);
+            if (info.ResourceName.empty()) {
+                printf("[TrackBrowser] Track has invalid resource name; expected format: author:mod_name");
+                info.ResourceName = std::string("mods:") + name;
+            }
             printf("[TrackBrowser] Added custom track %s\n", info.Name.c_str());
             gTrackRegistry.Add(info, [info, archive]() {
                 auto track = std::make_unique<Track>();
diff --git a/src/engine/tracks/BansheeBoardwalk.cpp b/src/engine/tracks/BansheeBoardwalk.cpp
index 337dc14cd..4614f6852 100644
--- a/src/engine/tracks/BansheeBoardwalk.cpp
+++ b/src/engine/tracks/BansheeBoardwalk.cpp
@@ -56,7 +56,6 @@ BansheeBoardwalk::BansheeBoardwalk() {
     ResizeMinimap(&Props.Minimap);
 
     ResourceName = "mk:banshee_boardwalk";
-
     Props.SetText(Props.Name, "banshee boardwalk", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "ghost", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "747m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/BigDonut.cpp b/src/engine/tracks/BigDonut.cpp
index c511a39ec..88b9760c9 100644
--- a/src/engine/tracks/BigDonut.cpp
+++ b/src/engine/tracks/BigDonut.cpp
@@ -45,6 +45,7 @@ BigDonut::BigDonut() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:big_donut";
     Props.SetText(Props.Name, "big donut", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "doughnut", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/BlockFort.cpp b/src/engine/tracks/BlockFort.cpp
index 1bb7d3394..6244e3ea2 100644
--- a/src/engine/tracks/BlockFort.cpp
+++ b/src/engine/tracks/BlockFort.cpp
@@ -47,6 +47,7 @@ BlockFort::BlockFort() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:block_fort";
     Props.SetText(Props.Name, "block fort", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "block", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/BowsersCastle.cpp b/src/engine/tracks/BowsersCastle.cpp
index 87b8c3f22..8a5fdf39a 100644
--- a/src/engine/tracks/BowsersCastle.cpp
+++ b/src/engine/tracks/BowsersCastle.cpp
@@ -51,7 +51,6 @@ BowsersCastle::BowsersCastle() {
     ResizeMinimap(&Props.Minimap);
 
     ResourceName = "mk:bowsers_castle";
-
     Props.SetText(Props.Name, "bowser's castle", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "castle", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "777m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/DKJungle.cpp b/src/engine/tracks/DKJungle.cpp
index 75c93c844..11e8cf6c1 100644
--- a/src/engine/tracks/DKJungle.cpp
+++ b/src/engine/tracks/DKJungle.cpp
@@ -53,6 +53,7 @@ DKJungle::DKJungle() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:dk_jungle";
     Props.SetText(Props.Name, "d.k.'s jungle parkway", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "jungle", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "893m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/DoubleDeck.cpp b/src/engine/tracks/DoubleDeck.cpp
index 001f943aa..04d97d22d 100644
--- a/src/engine/tracks/DoubleDeck.cpp
+++ b/src/engine/tracks/DoubleDeck.cpp
@@ -46,6 +46,7 @@ DoubleDeck::DoubleDeck() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:double_deck";
     Props.SetText(Props.Name, "double deck", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "deck", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/FrappeSnowland.cpp b/src/engine/tracks/FrappeSnowland.cpp
index 7aa8562db..338a2be2a 100644
--- a/src/engine/tracks/FrappeSnowland.cpp
+++ b/src/engine/tracks/FrappeSnowland.cpp
@@ -53,6 +53,7 @@ FrappeSnowland::FrappeSnowland() {
     Props.Minimap.Colour = {72, 100, 255};
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:frappe_snowland";
     Props.SetText(Props.Name, "frappe snowland", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "snow", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "734m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/KalimariDesert.cpp b/src/engine/tracks/KalimariDesert.cpp
index cec9c8405..c6477cabc 100644
--- a/src/engine/tracks/KalimariDesert.cpp
+++ b/src/engine/tracks/KalimariDesert.cpp
@@ -49,6 +49,7 @@ KalimariDesert::KalimariDesert() {
     Props.Minimap.FinishlineY = 4.0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:kalimari_desert";
     Props.SetText(Props.Name, "kalimari desert", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "desert", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "753m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/MooMooFarm.cpp b/src/engine/tracks/MooMooFarm.cpp
index ef59dac7e..7d2f27b4d 100644
--- a/src/engine/tracks/MooMooFarm.cpp
+++ b/src/engine/tracks/MooMooFarm.cpp
@@ -51,6 +51,7 @@ MooMooFarm::MooMooFarm() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:moo_moo_farm";
     Props.SetText(Props.Name, "moo moo farm", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "farm", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "527m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/RainbowRoad.cpp b/src/engine/tracks/RainbowRoad.cpp
index 54239c3bc..83ca7239c 100644
--- a/src/engine/tracks/RainbowRoad.cpp
+++ b/src/engine/tracks/RainbowRoad.cpp
@@ -47,6 +47,7 @@ RainbowRoad::RainbowRoad() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:rainbow_road";
     Props.SetText(Props.Name, "rainbow road", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "rainbow", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "2000m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/RoyalRaceway.cpp b/src/engine/tracks/RoyalRaceway.cpp
index 5c8336f89..510518e5e 100644
--- a/src/engine/tracks/RoyalRaceway.cpp
+++ b/src/engine/tracks/RoyalRaceway.cpp
@@ -48,6 +48,7 @@ RoyalRaceway::RoyalRaceway() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:royal_raceway";
     Props.SetText(Props.Name, "royal raceway", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "p circuit", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "1025m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/SherbetLand.cpp b/src/engine/tracks/SherbetLand.cpp
index 2223f8eb9..29b2935c8 100644
--- a/src/engine/tracks/SherbetLand.cpp
+++ b/src/engine/tracks/SherbetLand.cpp
@@ -50,6 +50,7 @@ SherbetLand::SherbetLand() {
     Props.Minimap.Colour = {72, 100, 255};
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:sherbet_land";
     Props.SetText(Props.Name, "sherbet land", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "sherbet", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "756m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/Skyscraper.cpp b/src/engine/tracks/Skyscraper.cpp
index e4d4e215f..9c6a7e831 100644
--- a/src/engine/tracks/Skyscraper.cpp
+++ b/src/engine/tracks/Skyscraper.cpp
@@ -45,6 +45,7 @@ Skyscraper::Skyscraper() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:skyscraper";
     Props.SetText(Props.Name, "skyscraper", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "skyscraper", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/TestTrack.cpp b/src/engine/tracks/TestTrack.cpp
index 1df75d0b9..07cfab61e 100644
--- a/src/engine/tracks/TestTrack.cpp
+++ b/src/engine/tracks/TestTrack.cpp
@@ -72,7 +72,6 @@ TestTrack::TestTrack() {
     ResizeMinimap(&Props.Minimap);
 
     ResourceName = "hm:test_track";
-
     Props.SetText(Props.Name, "Test Track", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "test track", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "100m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/ToadsTurnpike.cpp b/src/engine/tracks/ToadsTurnpike.cpp
index 4a4c9bbcb..f735ba4c3 100644
--- a/src/engine/tracks/ToadsTurnpike.cpp
+++ b/src/engine/tracks/ToadsTurnpike.cpp
@@ -55,6 +55,7 @@ ToadsTurnpike::ToadsTurnpike() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:toads_turnpike";
     Props.SetText(Props.Name, "toad's turnpike", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "highway", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "1036m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/WarioStadium.cpp b/src/engine/tracks/WarioStadium.cpp
index 0cf42f400..7dbdf2c85 100644
--- a/src/engine/tracks/WarioStadium.cpp
+++ b/src/engine/tracks/WarioStadium.cpp
@@ -50,6 +50,7 @@ WarioStadium::WarioStadium() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:wario_stadium";
     Props.SetText(Props.Name, "wario stadium", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "stadium", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "1591m", sizeof(Props.TrackLength));
diff --git a/src/engine/tracks/YoshiValley.cpp b/src/engine/tracks/YoshiValley.cpp
index 4d00100d4..831981858 100644
--- a/src/engine/tracks/YoshiValley.cpp
+++ b/src/engine/tracks/YoshiValley.cpp
@@ -47,6 +47,7 @@ YoshiValley::YoshiValley() {
     Props.Minimap.FinishlineY = 0;
     ResizeMinimap(&Props.Minimap);
 
+    ResourceName = "mk:yoshi_valley";
     Props.SetText(Props.Name, "yoshi valley", sizeof(Props.Name));
     Props.SetText(Props.DebugName, "maze", sizeof(Props.DebugName));
     Props.SetText(Props.TrackLength, "772m", sizeof(Props.TrackLength));