Game.cpp and World.cpp Cleanup (#159)

* Remove CProperties and delete dup Properties from World.h

* Improvement

* Fix compile

* Cleanup

* Document gRaceState

* wip cleanup

* compile

* Impl PlayerBombKart

* Rename CourseManager_ to CM_

* Finish renames m_ to CM_

* cleanup

* Remove extra printf

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

1 files changed, 1 insertions, 23 deletions

diff --git a/src/engine/World.cpp b/src/engine/World.cpp
index 5617efd39..d67a2577c 100644
--- a/src/engine/World.cpp
+++ b/src/engine/World.cpp
@@ -2,7 +2,6 @@
 #include "World.h"
 #include "Cup.h"
 #include "courses/Course.h"
-#include "vehicles/Vehicle.h"
 #include "objects/BombKart.h"
 #include "TrainCrossing.h"
 #include <memory>
@@ -12,7 +11,6 @@ extern "C" {
    #include "camera.h"
    #include "objects.h"
    #include "main.h"
-   #include "engine/Engine.h"
    #include "defines.h"
    #include "audio/external.h"
    #include "menus.h"
@@ -35,26 +33,12 @@ void World::SetCourseFromCup() {
     CurrentCourse = CurrentCup->GetCourse();
 }
 
-
-AVehicle* World::AddVehicle(AVehicle* vehicle) {
-    Vehicles.push_back(vehicle);
-    return Vehicles.back();
-}
-
-void World::ClearVehicles(void) {
-    Vehicles.clear();
-}
-
 TrainCrossing* World::AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius) {
     auto crossing = std::make_shared<TrainCrossing>(position, waypointMin, waypointMax, approachRadius, exitRadius);
     Crossings.push_back(crossing);
     return crossing.get();
 }
 
-void World::AddBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C) {
-    BombKarts.push_back(new OBombKart(pos, waypoint, waypointIndex, state, unk_3C));
-}
-
 u32 World::GetCupIndex() {
     return this->CupIndex;
 }
@@ -97,13 +81,6 @@ void World::SetCup(Cup* cup) {
     }
 }
 
-CProperties* World::GetCourseProps() {
-    if (Courses[CourseIndex]) {
-        return (CProperties*) &Courses[CourseIndex]->Props;
-    }
-    return nullptr;
-}
-
 void World::SetCourse(const char* name) {
     //! @todo Use content dictionary instead
     for (size_t i = 0; i < Courses.size(); i++) {
@@ -168,6 +145,7 @@ AActor* World::GetActor(size_t index) {
 }
 
 void World::TickActors() {
+    // This only ticks modded actors
     for (AActor* actor : Actors) {
         if (actor->IsMod()) {
             actor->Tick();