clang formatclang-format

20 files changed, 141 insertions, 135 deletions

diff --git a/src/engine/actors/Banana.cpp b/src/engine/actors/Banana.cpp
index 6c7f837d1..2c7eb8f99 100644
--- a/src/engine/actors/Banana.cpp
+++ b/src/engine/actors/Banana.cpp
@@ -14,7 +14,7 @@ ABanana::ABanana(uint16_t playerId, const float pos[3], const s16 rot[3], const
     Name = "Banana";
     // Initialize the BananaActor's position, rotation, and velocity
     std::copy(pos, pos + 3, Pos);
-    //std::copy(rot, rot + 3, this->a.rot);
+    // std::copy(rot, rot + 3, this->a.rot);
     std::copy(velocity, velocity + 3, Velocity);
 
     Type = 6; // ACTOR_BANANA
@@ -23,8 +23,8 @@ ABanana::ABanana(uint16_t playerId, const float pos[3], const s16 rot[3], const
     State = HELD_BANANA;
 
     PlayerId = playerId;
-    
-    //this->a.unk_08 = 0.0f;
+
+    // this->a.unk_08 = 0.0f;
     Flags |= 0x4000 | 0x1000;
     BoundingBoxSize = 2.0f;
 
@@ -48,14 +48,16 @@ ABanana::ABanana(uint16_t playerId, const float pos[3], const s16 rot[3], const
     Unk30.orientationVector[2] = 0.0f;
 }
 
-void ABanana::Tick() { 
-    update_actor_banana((BananaActor*)this);
+void ABanana::Tick() {
+    update_actor_banana((BananaActor*) this);
 }
 
-void ABanana::Draw(Camera *camera) {
-    render_actor_banana(camera, NULL, (BananaActor*)this);
+void ABanana::Draw(Camera* camera) {
+    render_actor_banana(camera, NULL, (BananaActor*) this);
+}
+void ABanana::Collision(Player* player, AActor*) {
+}
+void ABanana::Destroy() {
 }
-void ABanana::Collision(Player* player, AActor*) { }
-void ABanana::Destroy() { }
 
-//void ABanana::Held() {}
+// void ABanana::Held() {}
diff --git a/src/engine/actors/Banana.h b/src/engine/actors/Banana.h
index d8c55e9cb..d7985b545 100644
--- a/src/engine/actors/Banana.h
+++ b/src/engine/actors/Banana.h
@@ -4,8 +4,7 @@
 #include "engine/Actor.h"
 
 class ABanana : public AActor {
-public:
-
+  public:
     uint16_t PlayerId;
 
     // Constructor
diff --git a/src/engine/actors/BowserStatue.cpp b/src/engine/actors/BowserStatue.cpp
index c680c4c25..d3af82b2a 100644
--- a/src/engine/actors/BowserStatue.cpp
+++ b/src/engine/actors/BowserStatue.cpp
@@ -19,7 +19,7 @@ ABowserStatue::ABowserStatue(FVector pos, ABowserStatue::Behaviour behaviour) {
 }
 
 void ABowserStatue::Tick() {
-    switch(_behaviour) {
+    switch (_behaviour) {
         case DEFAULT:
             break;
         case CRUSH:
@@ -27,7 +27,7 @@ void ABowserStatue::Tick() {
     }
 }
 
-void ABowserStatue::Draw(Camera *camera) {
+void ABowserStatue::Draw(Camera* camera) {
     Mat4 mtx;
     Vec3f pos;
     pos[0] = Pos.x + 76;
@@ -43,4 +43,6 @@ void ABowserStatue::Draw(Camera *camera) {
     }
 }
 
-bool ABowserStatue::IsMod() { return true; }
+bool ABowserStatue::IsMod() {
+    return true;
+}
diff --git a/src/engine/actors/BowserStatue.h b/src/engine/actors/BowserStatue.h
index 869f6910f..8e3479502 100644
--- a/src/engine/actors/BowserStatue.h
+++ b/src/engine/actors/BowserStatue.h
@@ -14,11 +14,8 @@ extern Vtx gBowserStatueVtx[717];
 extern Gfx gBowserStatueGfx[162];
 
 class ABowserStatue : public AActor {
-public:
-    enum Behaviour {
-        DEFAULT,
-        CRUSH
-    };
+  public:
+    enum Behaviour { DEFAULT, CRUSH };
 
     virtual ~ABowserStatue() = default;
     explicit ABowserStatue(FVector pos, ABowserStatue::Behaviour behaviour);
@@ -28,7 +25,8 @@ public:
     virtual bool IsMod() override;
 
     FVector Pos;
-private:
+
+  private:
     ABowserStatue::Behaviour _behaviour;
     f32 scale;
 };
diff --git a/src/engine/actors/Cloud.cpp b/src/engine/actors/Cloud.cpp
index cae55e342..1c8f74c60 100644
--- a/src/engine/actors/Cloud.cpp
+++ b/src/engine/actors/Cloud.cpp
@@ -15,15 +15,15 @@ extern f32 gKartGravityTable[];
 }
 
 ACloud::ACloud(FVector pos) {
-	Name = "Cloud";
-	Pos[0] = pos.x;
-	Pos[1] = pos.y;
-	Pos[2] = pos.z;
-	Rot[0] = 0;
-	Rot[1] = 0;
-	Rot[2] = 0;
+    Name = "Cloud";
+    Pos[0] = pos.x;
+    Pos[1] = pos.y;
+    Pos[2] = pos.z;
+    Rot[0] = 0;
+    Rot[1] = 0;
+    Rot[2] = 0;
 
-    //Flags = -0x8000 | 0x4000;
+    // Flags = -0x8000 | 0x4000;
 
     BoundingBoxSize = 2.0f;
 }
@@ -48,7 +48,7 @@ void ACloud::Tick() {
 
 extern Gfx cloud_mesh[];
 
-void ACloud::Draw(Camera *camera) {
+void ACloud::Draw(Camera* camera) {
     Mat4 mtx;
 
     if (PickedUp) {
@@ -58,14 +58,14 @@ void ACloud::Draw(Camera *camera) {
     mtxf_pos_rotation_xyz(mtx, Pos, Rot);
     if (render_set_position(mtx, 0) != 0) {
         gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
-        gSPDisplayList(gDisplayListHead++, (Gfx*)cloud_mesh);
+        gSPDisplayList(gDisplayListHead++, (Gfx*) cloud_mesh);
     }
 }
 
 void ACloud::Collision(Player* player, AActor* actor) {
     if (!PickedUp) {
         if (query_collision_player_vs_actor_item(player, gWorldInstance.ConvertAActorToActor(actor))) {
-			// Player has picked up the actor, activate the cloud effect
+            // Player has picked up the actor, activate the cloud effect
             _player = player;
             PickedUp = true;
 
@@ -77,61 +77,65 @@ void ACloud::Collision(Player* player, AActor* actor) {
     }
 }
 
-bool ACloud::IsMod() { return true; }
+bool ACloud::IsMod() {
+    return true;
+}
 
 Vtx cloud_mesh_vtx_cull[8] = {
-	{{ {0, -4, -4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, -4, 4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, 4, 4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, 4, -4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, -4, -4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, -4, 4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, 4, 4}, 0, {0, 0}, {0, 0, 0, 0} }},
-	{{ {0, 4, -4}, 0, {0, 0}, {0, 0, 0, 0} }},
+    { { { 0, -4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, -4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },
+    { { { 0, 4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },   { { { 0, 4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },
+    { { { 0, -4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } }, { { { 0, -4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },
+    { { { 0, 4, 4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },   { { { 0, 4, -4 }, 0, { 0, 0 }, { 0, 0, 0, 0 } } },
 };
 
 Vtx cloud_mesh_vtx_0[4] = {
-	{{ {0, 4, 4}, 0, {-524, -530}, {255, 255, 255, 166} }},
-	{{ {0, -4, 4}, 0, {-530, 1516}, {255, 255, 255, 201} }},
-	{{ {0, -4, -4}, 0, {1516, 1522}, {255, 255, 255, 188} }},
-	{{ {0, 4, -4}, 0, {1522, -524}, {255, 255, 255, 154} }},
+    { { { 0, 4, 4 }, 0, { -524, -530 }, { 255, 255, 255, 166 } } },
+    { { { 0, -4, 4 }, 0, { -530, 1516 }, { 255, 255, 255, 201 } } },
+    { { { 0, -4, -4 }, 0, { 1516, 1522 }, { 255, 255, 255, 188 } } },
+    { { { 0, 4, -4 }, 0, { 1522, -524 }, { 255, 255, 255, 154 } } },
 };
 
 Gfx cloud_mesh_tri_0[] = {
-	gsSPVertex(cloud_mesh_vtx_0 + 0, 4, 0),
-	gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
-	gsSPEndDisplayList(),
+    gsSPVertex(cloud_mesh_vtx_0 + 0, 4, 0),
+    gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
+    gsSPEndDisplayList(),
 };
 
 Gfx mat_cloud_cutout[] = {
-	gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH),
-	gsSPClearGeometryMode(G_CULL_FRONT | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_CLIPPING),
-	gsDPPipeSync(),
-	gsDPSetCombineLERP(TEXEL0, PRIMITIVE, PRIMITIVE, TEXEL1, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED),
-	gsSPSetOtherMode(G_SETOTHERMODE_H, 4, 20, G_AD_NOISE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE),
-	gsSPSetOtherMode(G_SETOTHERMODE_L, 0, 32, G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2),
-	gsSPTexture(65535, 65535, 0, 0, 1),
-	gsDPSetPrimColor(0, 0, 255, 220, 203, 255),
-	gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 1, gTexture69C4E4),
-	gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(7, 0, 0, 511, 512),
-	gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 1, G_TX_WRAP | G_TX_NOMIRROR, 5, 1),
-	gsDPSetTileSize(0, 98, 100, 124, 124),
-	gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, gTexture66C8F4),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 128, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
-	gsDPLoadBlock(6, 0, 0, 1023, 256),
-	gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 128, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
-	gsDPSetTileSize(1, 0, 0, 124, 124),
-	gsSPEndDisplayList(),
+    gsSPSetGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH),
+    gsSPClearGeometryMode(G_CULL_FRONT | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD |
+                          G_CLIPPING),
+    gsDPPipeSync(),
+    gsDPSetCombineLERP(TEXEL0, PRIMITIVE, PRIMITIVE, TEXEL1, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, 0, 0, 0,
+                       COMBINED),
+    gsSPSetOtherMode(G_SETOTHERMODE_H, 4, 20,
+                     G_AD_NOISE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE |
+                         G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE),
+    gsSPSetOtherMode(G_SETOTHERMODE_L, 0, 32, G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2),
+    gsSPTexture(65535, 65535, 0, 0, 1),
+    gsDPSetPrimColor(0, 0, 255, 220, 203, 255),
+    gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 1, gTexture69C4E4),
+    gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0,
+                G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(7, 0, 0, 511, 512),
+    gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 1, G_TX_WRAP | G_TX_NOMIRROR, 5, 1),
+    gsDPSetTileSize(0, 98, 100, 124, 124),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, gTexture66C8F4),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 128, 6, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0,
+                G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
+    gsDPLoadBlock(6, 0, 0, 1023, 256),
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 128, 1, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR,
+                5, 0),
+    gsDPSetTileSize(1, 0, 0, 124, 124),
+    gsSPEndDisplayList(),
 };
 
 Gfx cloud_mesh[] = {
-	//gsSPClearGeometryMode(G_LIGHTING),
-	//gsSPVertex(cloud_mesh_vtx_cull + 0, 8, 0),
-	gsSPSetGeometryMode(G_LIGHTING),
-	//gsSPCullDisplayList(0, 7),
-	gsSPDisplayList(mat_cloud_cutout),
-	gsSPDisplayList(cloud_mesh_tri_0),
-	gsSPEndDisplayList(),
+    // gsSPClearGeometryMode(G_LIGHTING),
+    // gsSPVertex(cloud_mesh_vtx_cull + 0, 8, 0),
+    gsSPSetGeometryMode(G_LIGHTING),
+    // gsSPCullDisplayList(0, 7),
+    gsSPDisplayList(mat_cloud_cutout),
+    gsSPDisplayList(cloud_mesh_tri_0),
+    gsSPEndDisplayList(),
 };
-
diff --git a/src/engine/actors/Cloud.h b/src/engine/actors/Cloud.h
index 4805c08b9..657340b14 100644
--- a/src/engine/actors/Cloud.h
+++ b/src/engine/actors/Cloud.h
@@ -12,9 +12,7 @@ extern "C" {
 }
 
 class ACloud : public AActor {
-public:
-
-
+  public:
     // Constructor
     ACloud(FVector pos);
 
@@ -28,13 +26,12 @@ public:
 
     bool PickedUp = false;
     uint32_t Timer = 0;
-    
+
     Player* _player = NULL;
-    
+
     f32 Hop = 3.0f;
     f32 Gravity = 200.0f;
 
     f32 OldHop = 0;
     f32 OldGravity = 0;
-
 };
diff --git a/src/engine/actors/Finishline.cpp b/src/engine/actors/Finishline.cpp
index 0680e60bd..197442f9e 100644
--- a/src/engine/actors/Finishline.cpp
+++ b/src/engine/actors/Finishline.cpp
@@ -41,14 +41,14 @@ AFinishline::AFinishline(std::optional<FVector> pos) {
     BoundingBoxSize = 0.0f;
 }
 
-void AFinishline::Tick() {}
+void AFinishline::Tick() {
+}
 
-void AFinishline::Draw(Camera *camera) {
+void AFinishline::Draw(Camera* camera) {
     Mat4 mtx;
     s16 temp = Pos[2];
     s32 maxObjectsReached;
 
-
     if (gGamestate == CREDITS_SEQUENCE) {
         return;
     }
@@ -64,18 +64,21 @@ void AFinishline::Draw(Camera *camera) {
         if (D_800DC5BC != 0) {
 
             gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF);
-            gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D001C20);
+            gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D001C20);
         } else {
-            gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D001B90);
+            gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D001B90);
         }
     } else if (D_800DC5BC != 0) {
         gDPSetFogColor(gDisplayListHead++, D_801625EC, D_801625F4, D_801625F0, 0xFF);
-        gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D001C88);
+        gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D001C88);
     } else {
-        gSPDisplayList(gDisplayListHead++, (Gfx*)D_0D001BD8);
+        gSPDisplayList(gDisplayListHead++, (Gfx*) D_0D001BD8);
     }
 }
 
-void AFinishline::Collision(Player* player, AActor* actor) {}
+void AFinishline::Collision(Player* player, AActor* actor) {
+}
 
-bool AFinishline::IsMod() { return true; }
+bool AFinishline::IsMod() {
+    return true;
+}
diff --git a/src/engine/actors/Finishline.h b/src/engine/actors/Finishline.h
index 61b561a5e..e40d6ffe0 100644
--- a/src/engine/actors/Finishline.h
+++ b/src/engine/actors/Finishline.h
@@ -12,7 +12,7 @@ extern "C" {
 }
 
 class AFinishline : public AActor {
-public:
+  public:
     /**
      * Default behaviour places the finishline at the first waypoint.
      * @arg pos, optional. Sets a custom position
@@ -29,13 +29,12 @@ public:
 
     bool PickedUp = false;
     uint32_t Timer = 0;
-    
+
     Player* _player = NULL;
-    
+
     f32 Hop = 3.0f;
     f32 Gravity = 200.0f;
 
     f32 OldHop = 0;
     f32 OldGravity = 0;
-
 };
diff --git a/src/engine/actors/MarioSign.cpp b/src/engine/actors/MarioSign.cpp
index f39e4f69b..5e92e8220 100644
--- a/src/engine/actors/MarioSign.cpp
+++ b/src/engine/actors/MarioSign.cpp
@@ -33,7 +33,7 @@ void AMarioSign::Tick() {
     }
 }
 
-void AMarioSign::Draw(Camera *camera) {
+void AMarioSign::Draw(Camera* camera) {
     Mat4 sp40;
     f32 unk;
 
@@ -50,7 +50,7 @@ void AMarioSign::Draw(Camera *camera) {
         gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
         mtxf_pos_rotation_xyz(sp40, Pos, Rot);
         if (render_set_position(sp40, 0) != 0) {
-            gSPDisplayList(gDisplayListHead++, (Gfx*)d_course_mario_raceway_dl_sign);
+            gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_mario_raceway_dl_sign);
         }
     }
 }
diff --git a/src/engine/actors/MarioSign.h b/src/engine/actors/MarioSign.h
index 099894dc1..b077ee7e7 100644
--- a/src/engine/actors/MarioSign.h
+++ b/src/engine/actors/MarioSign.h
@@ -9,8 +9,7 @@ extern "C" {
 }
 
 class AMarioSign : public AActor {
-public:
-
+  public:
     virtual ~AMarioSign() = default;
     explicit AMarioSign(FVector pos);
 
diff --git a/src/engine/actors/Ship.cpp b/src/engine/actors/Ship.cpp
index 5af3553e2..de92eec62 100644
--- a/src/engine/actors/Ship.cpp
+++ b/src/engine/actors/Ship.cpp
@@ -20,8 +20,8 @@ AShip::AShip(FVector pos, AShip::Skin skin) {
     Pos[1] = pos.y;
     Pos[2] = pos.z;
     Scale = FVector(0.4, 0.4, 0.4);
-    
-    switch(skin) {
+
+    switch (skin) {
         case GHOSTSHIP:
             Name = "Ghostship";
             _skin = ghostship_Plane_mesh;
@@ -53,4 +53,6 @@ void AShip::Tick() {
     // Rot.yaw = -static_cast<int16_t>(angle * (32768.0f / M_PI / 2.0f));
 }
 
-bool AShip::IsMod() { return true; }
+bool AShip::IsMod() {
+    return true;
+}
diff --git a/src/engine/actors/Ship.h b/src/engine/actors/Ship.h
index fe5743922..15e4ca48c 100644
--- a/src/engine/actors/Ship.h
+++ b/src/engine/actors/Ship.h
@@ -11,8 +11,7 @@ extern "C" {
 }
 
 class AShip : public AActor {
-public:
-
+  public:
     enum Skin {
         GHOSTSHIP,
         SHIP2,
@@ -26,9 +25,9 @@ public:
     virtual bool IsMod() override;
 
     FVector Spawn;
-    //FVector Pos;
-    ///IRotator Rot = {0, 0, 0};
-    //FVector Scale = {0.4, 0.4, 0.4};
-private:
+    // FVector Pos;
+    /// IRotator Rot = {0, 0, 0};
+    // FVector Scale = {0.4, 0.4, 0.4};
+  private:
     Gfx* _skin;
 };
diff --git a/src/engine/actors/SpaghettiShip.cpp b/src/engine/actors/SpaghettiShip.cpp
index b09ada319..0566fd4b6 100644
--- a/src/engine/actors/SpaghettiShip.cpp
+++ b/src/engine/actors/SpaghettiShip.cpp
@@ -17,12 +17,12 @@ ASpaghettiShip::ASpaghettiShip(FVector pos) {
     Pos[2] = pos.z;
     Spawn = pos;
     Spawn.y += 10;
-    Scale = {0.4, 0.4, 0.4};
+    Scale = { 0.4, 0.4, 0.4 };
 }
 
 void ASpaghettiShip::Tick() {
     static float angle = 0.0f; // Keeps track of the ship's rotation around the circle
-    float radius = 150.0f;      // The radius of the circular path
+    float radius = 150.0f;     // The radius of the circular path
     float speed = 0.01f;       // Speed of rotation
 
     angle += speed; // Increment the angle to move in a circle
@@ -37,22 +37,22 @@ void ASpaghettiShip::Tick() {
     WheelRot.pitch += 500;
 }
 
-void ASpaghettiShip::Draw(Camera *camera) {
+void ASpaghettiShip::Draw(Camera* camera) {
     Mat4 shipMtx;
     Mat4 objectMtx;
     Mat4 resultMtx;
-    Vec3f hullPos = {Pos[0], Pos[1], Pos[2]};
-    Vec3s hullRot = {Rot[0], Rot[1], Rot[2]};
-    Vec3s rot = {WheelRot.pitch, WheelRot.yaw, WheelRot.roll};
+    Vec3f hullPos = { Pos[0], Pos[1], Pos[2] };
+    Vec3s hullRot = { Rot[0], Rot[1], Rot[2] };
+    Vec3s rot = { WheelRot.pitch, WheelRot.yaw, WheelRot.roll };
 
     gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
     gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
 
-    ApplyMatrixTransformations(shipMtx, *(FVector*)Pos, *(IRotator*)Rot, Scale);
+    ApplyMatrixTransformations(shipMtx, *(FVector*) Pos, *(IRotator*) Rot, Scale);
     if (render_set_position(shipMtx, 0) != 0) {}
 
     // Render the ships hull
-    ApplyMatrixTransformations(objectMtx, {0, 0, 0}, {0, 0, 0}, {1, 1, 1});
+    ApplyMatrixTransformations(objectMtx, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 });
     mtxf_multiplication(resultMtx, shipMtx, objectMtx);
     if (render_set_position(resultMtx, 3) != 0) {
         gSPDisplayList(gDisplayListHead++, ship1_spag1_mesh);
@@ -67,10 +67,10 @@ void ASpaghettiShip::Draw(Camera *camera) {
         gSPDisplayList(gDisplayListHead++, wheels_Spaghetti_002_mesh);
         gSPPopMatrix(gDisplayListHead++, G_MTX_MODELVIEW);
     }
-    
+
     // Back tyre
     AddLocalRotation(shipMtx, WheelRot);
-    ApplyMatrixTransformations(objectMtx, FVector(0, 0, -165), {0, 0, 0}, {1, 1, 1});
+    ApplyMatrixTransformations(objectMtx, FVector(0, 0, -165), { 0, 0, 0 }, { 1, 1, 1 });
     mtxf_multiplication(resultMtx, shipMtx, objectMtx);
     if (render_set_position(resultMtx, 3) != 0) {
         gSPDisplayList(gDisplayListHead++, wheels_Spaghetti_002_mesh);
@@ -78,4 +78,6 @@ void ASpaghettiShip::Draw(Camera *camera) {
     }
 }
 
-bool ASpaghettiShip::IsMod() { return true; }
+bool ASpaghettiShip::IsMod() {
+    return true;
+}
diff --git a/src/engine/actors/SpaghettiShip.h b/src/engine/actors/SpaghettiShip.h
index 70bd047d7..9afef2719 100644
--- a/src/engine/actors/SpaghettiShip.h
+++ b/src/engine/actors/SpaghettiShip.h
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 class ASpaghettiShip : public AActor {
-public:
+  public:
     explicit ASpaghettiShip(FVector pos);
     virtual ~ASpaghettiShip() = default;
 
@@ -20,5 +20,5 @@ public:
     virtual bool IsMod() override;
 
     FVector Spawn;
-    IRotator WheelRot = {0, 0, 0};
+    IRotator WheelRot = { 0, 0, 0 };
 };
diff --git a/src/engine/actors/Starship.cpp b/src/engine/actors/Starship.cpp
index e104d0eb6..3bcd7c83b 100644
--- a/src/engine/actors/Starship.cpp
+++ b/src/engine/actors/Starship.cpp
@@ -33,10 +33,12 @@ void AStarship::Tick() {
     SetLocation(pos);
 
     // Keep y from changing (or adjust it if necessary)
-    //Pos.y = Spawn.y;
+    // Pos.y = Spawn.y;
 
     // Rotate to face forward along the circle
     Rot[1] = angle * (180.0f / M_PI) + 90.0f;
 }
 
-bool AStarship::IsMod() { return true; }
+bool AStarship::IsMod() {
+    return true;
+}
diff --git a/src/engine/actors/Starship.h b/src/engine/actors/Starship.h
index 71b898358..83a8c2f82 100644
--- a/src/engine/actors/Starship.h
+++ b/src/engine/actors/Starship.h
@@ -11,7 +11,7 @@ extern "C" {
 }
 
 class AStarship : public AActor {
-public:
+  public:
     explicit AStarship(FVector pos);
     virtual ~AStarship() = default;
 
diff --git a/src/engine/actors/Tree.cpp b/src/engine/actors/Tree.cpp
index faffd0798..2081a29a2 100644
--- a/src/engine/actors/Tree.cpp
+++ b/src/engine/actors/Tree.cpp
@@ -37,13 +37,12 @@ void ATree::Draw(Camera* camera) {
         return;
     }
 
-    dist = is_within_render_distance(camera->pos, Pos, camera->rot[1], 0, gCameraZoom[camera - camera1],
-                                        DrawDistance);
+    dist = is_within_render_distance(camera->pos, Pos, camera->rot[1], 0, gCameraZoom[camera - camera1], DrawDistance);
 
     if (CVarGetInteger("gNoCulling", 0) == 1) {
         dist = MAX(dist, 0.0f);
     }
- 
+
     if (dist < 0.0f) {
         return;
     }
@@ -63,5 +62,7 @@ void ATree::Draw(Camera* camera) {
     }
 }
 
-void ATree::Collision(Player* player, AActor*) { }
-void ATree::Destroy() { }
+void ATree::Collision(Player* player, AActor*) {
+}
+void ATree::Destroy() {
+}
diff --git a/src/engine/actors/Tree.h b/src/engine/actors/Tree.h
index eb51f6e7e..6df8c5053 100644
--- a/src/engine/actors/Tree.h
+++ b/src/engine/actors/Tree.h
@@ -7,13 +7,11 @@ extern "C" {
 #include "common_structs.h"
 }
 
-
 // Note that this doesn't seem to work right
 // Use add_actor_to_empty_slot(test, rot, vel, ACTOR_TREE_MARIO_RACEWAY);
 // to spawn stock actors
 class ATree : public AActor {
-public:
-
+  public:
     Gfx* Displaylist;
     const char* Tlut;
     f32 DrawDistance;
diff --git a/src/engine/actors/WarioSign.cpp b/src/engine/actors/WarioSign.cpp
index 0e83e114f..ba1001b8e 100644
--- a/src/engine/actors/WarioSign.cpp
+++ b/src/engine/actors/WarioSign.cpp
@@ -22,7 +22,7 @@ void AWarioSign::Tick() {
     Rot[1] += 0xB6;
 }
 
-void AWarioSign::Draw(Camera *camera) {
+void AWarioSign::Draw(Camera* camera) {
     Mat4 sp38;
     f32 unk =
         is_within_render_distance(camera->pos, Pos, camera->rot[1], 0, gCameraZoom[camera - camera1], 16000000.0f);
@@ -37,7 +37,7 @@ void AWarioSign::Draw(Camera *camera) {
         mtxf_pos_rotation_xyz(sp38, Pos, Rot);
         if (render_set_position(sp38, 0) != 0) {
 
-            gSPDisplayList(gDisplayListHead++, (Gfx*)d_course_wario_stadium_dl_sign);
+            gSPDisplayList(gDisplayListHead++, (Gfx*) d_course_wario_stadium_dl_sign);
         }
     }
 }
diff --git a/src/engine/actors/WarioSign.h b/src/engine/actors/WarioSign.h
index 634b2132e..15ab72a91 100644
--- a/src/engine/actors/WarioSign.h
+++ b/src/engine/actors/WarioSign.h
@@ -9,8 +9,7 @@ extern "C" {
 }
 
 class AWarioSign : public AActor {
-public:
-
+  public:
     virtual ~AWarioSign() = default;
     explicit AWarioSign(FVector pos);