From 19135c9ee83643ea863d5725c22319e502938cac Mon Sep 17 00:00:00 2001
From: MegaMech <7255464+MegaMech@users.noreply.github.com>
Date: Thu, 5 Dec 2024 21:41:58 -0700
Subject: load course dl textures from otr and move objects

---
 src/engine/courses/BlockFort.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/engine/courses/BlockFort.cpp')

diff --git a/src/engine/courses/BlockFort.cpp b/src/engine/courses/BlockFort.cpp
index a61e26280..6178dcc5c 100644
--- a/src/engine/courses/BlockFort.cpp
+++ b/src/engine/courses/BlockFort.cpp
@@ -4,9 +4,8 @@
 #include <memory>
 
 #include "BlockFort.h"
-#include "GameObject.h"
 #include "World.h"
-#include "engine/vehicles/OBombKart.h"
+#include "engine/objects/OBombKart.h"
 #include "assets/block_fort_data.h"
 
 extern "C" {
@@ -29,15 +28,23 @@ extern "C" {
     #include "actors.h"
     #include "collision.h"
     #include "memory.h"
+    #include "course_offsets.h"
     extern const char *block_fort_dls[];
     extern s16 currentScreenSection;
 }
 
+const course_texture block_fort_textures[] = {
+    { gTexture64286C, 0x010A, 0x0800, 0x0 },          { gTextureGrayCheckerboard, 0x010C, 0x0800, 0x0 },
+    { gTextureGrayCobblestone, 0x010C, 0x0800, 0x0 }, { gTexture64275C, 0x0110, 0x0800, 0x0 },
+    { gTexture642978, 0x010D, 0x0800, 0x0 },          { gTexture6747C4, 0x0145, 0x0800, 0x0 },
+    { gTexture6442D4, 0x0138, 0x0800, 0x0 },          { 0x00000000, 0x0000, 0x0000, 0x0 },
+};
+
 BlockFort::BlockFort() {
     this->vtx = d_course_block_fort_vertex;
     this->gfx = d_course_block_fort_packed_dls;
     this->gfxSize = 699;
-    this->textures = block_fort_textures;
+    Props.textures = block_fort_textures;
     Props.MinimapTexture = gTextureCourseOutlineBlockFort;
     Props.D_800E5548[0] = 64;
     Props.D_800E5548[1] = 64;
-- 
cgit v1.2.3


From 95b8cca50025f7fa10e47ca24ac5f71f9813a2e3 Mon Sep 17 00:00:00 2001
From: MegaMech <7255464+MegaMech@users.noreply.github.com>
Date: Wed, 11 Dec 2024 20:58:18 -0700
Subject: Reimplementing objects

---
 src/engine/courses/BlockFort.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/engine/courses/BlockFort.cpp')

diff --git a/src/engine/courses/BlockFort.cpp b/src/engine/courses/BlockFort.cpp
index 6178dcc5c..948eaf5e0 100644
--- a/src/engine/courses/BlockFort.cpp
+++ b/src/engine/courses/BlockFort.cpp
@@ -5,7 +5,7 @@
 
 #include "BlockFort.h"
 #include "World.h"
-#include "engine/objects/OBombKart.h"
+#include "engine/objects/BombKart.h"
 #include "assets/block_fort_data.h"
 
 extern "C" {
-- 
cgit v1.2.3