diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-06-28 21:54:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-28 15:54:06 -0600 |
| commit | 956058a32dfa3f26a20bc65fa83ac916fde073ab (patch) | |
| tree | 3c92ff722ba4265a40408f9768c5568e6c14756f /src/engine/World.cpp | |
| parent | 35a28cd9336dbc4b199b180c93c8246c0efdbf9e (diff) | |
correct use of pointer and fix mistake (#394)
* correct use of pointer and fix mistake
* remove CM_WeirdLength
* Update Game.cpp
* Update Game.cpp
---------
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/World.cpp')
| -rw-r--r-- | src/engine/World.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/engine/World.cpp b/src/engine/World.cpp index 88c6717c6..68ca27343 100644 --- a/src/engine/World.cpp +++ b/src/engine/World.cpp @@ -26,13 +26,12 @@ World::~World() { CM_CleanWorld(); } -Course* CurrentCourse; +std::shared_ptr<Course> CurrentCourse; Cup* CurrentCup; -Course* World::AddCourse(std::unique_ptr<Course> course) { - Course* ptr = course.get(); - gWorldInstance.Courses.push_back(std::move(course)); - return ptr; +std::shared_ptr<Course> World::AddCourse(std::shared_ptr<Course> course) { + gWorldInstance.Courses.push_back(course); + return course; } void World::AddCup(Cup* cup) { @@ -99,7 +98,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].get(); + CurrentCourse = Courses[i]; break; } } @@ -112,7 +111,7 @@ void World::NextCourse() { } else { CourseIndex = 0; } - gWorldInstance.CurrentCourse = Courses[CourseIndex].get(); + gWorldInstance.CurrentCourse = Courses[CourseIndex]; } void World::PreviousCourse() { @@ -121,7 +120,7 @@ void World::PreviousCourse() { } else { CourseIndex = Courses.size() - 1; } - gWorldInstance.CurrentCourse = Courses[CourseIndex].get(); + gWorldInstance.CurrentCourse = Courses[CourseIndex]; } AActor* World::AddActor(AActor* actor) { |
