1 files changed, 17 insertions, 7 deletions
diff --git a/src/engine/World.cpp b/src/engine/World.cpp
index cca7a2199..0922e6c6e 100644
--- a/src/engine/World.cpp
+++ b/src/engine/World.cpp
@@ -17,8 +17,8 @@ extern "C" {
 #include "defines.h"
 #include "audio/external.h"
 #include "menus.h"
-#include "common_data.h"
-#include "mario_raceway_data.h"
+#include "assets/models/common_data.h"
+#include "assets/models/tracks/mario_raceway/mario_raceway_data.h"
 }
 
 std::shared_ptr<Course> CurrentCourse;
@@ -41,8 +41,18 @@ void World::AddCup(Cup* cup) {
     Cups.push_back(cup);
 }
 
+void World::SetCurrentCourse(std::shared_ptr<Course> course) {
+    if (CurrentCourse) {
+        UnLoadCourse();
+    }
+    if (CurrentCourse == course) {
+        return;
+    }
+    CurrentCourse = std::move(course);
+}
+
 void World::SetCourseFromCup() {
-    CurrentCourse = CurrentCup->GetCourse();
+    SetCurrentCourse(CurrentCup->GetCourse());
 }
 
 TrainCrossing* World::AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius,
@@ -91,7 +101,7 @@ void World::SetCupIndex(size_t index) {
     CupIndex = index;
 }
 
-void World::SetCup(Cup* cup) {
+void World::SetCurrentCup(Cup* cup) {
     if (cup) {
         CurrentCup = cup;
         CurrentCup->CursorPosition = 0;
@@ -102,7 +112,7 @@ void World::SetCourse(const char* name) {
     //! @todo Use content dictionary instead
     for (size_t i = 0; i < Courses.size(); i++) {
         if (strcmp(Courses[i]->Props.Name, name) == 0) {
-            CurrentCourse = Courses[i];
+            SetCurrentCourse(Courses[i]);
             break;
         }
     }
@@ -115,7 +125,7 @@ void World::NextCourse() {
     } else {
         CourseIndex = 0;
     }
-    gWorldInstance.CurrentCourse = Courses[CourseIndex];
+    gWorldInstance.SetCurrentCourse(Courses[CourseIndex]);
 }
 
 void World::PreviousCourse() {
@@ -124,7 +134,7 @@ void World::PreviousCourse() {
     } else {
         CourseIndex = Courses.size() - 1;
     }
-    gWorldInstance.CurrentCourse = Courses[CourseIndex];
+    gWorldInstance.SetCurrentCourse(Courses[CourseIndex]);
 }
 
 AActor* World::AddActor(AActor* actor) {