diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index 7c9e6c8c04..76cc8a1b9d 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -398,7 +398,7 @@ public:
             const auto clipHeight = bkWidget.height() - 1;
             if (ClipDrawPixelInfo(&clipDPI, &dpi, screenPos, clipWidth, clipHeight))
             {
-                object->DrawPreview(&clipDPI, clipWidth, clipHeight);
+                object->DrawPreview(clipDPI, clipWidth, clipHeight);
             }
         }
 
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index ca438f5a18..2c8ea108b1 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -1057,7 +1057,7 @@ public:
             int32_t _height = previewWidget.height() - 1;
             if (ClipDrawPixelInfo(&clipDPI, &dpi, screenPos, _width, _height))
             {
-                _loadedObject->DrawPreview(&clipDPI, _width, _height);
+                _loadedObject->DrawPreview(clipDPI, _width, _height);
             }
         }
 
diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp
index 86d4cd6d9c..edf5331c33 100644
--- a/src/openrct2/object/BannerObject.cpp
+++ b/src/openrct2/object/BannerObject.cpp
@@ -74,15 +74,15 @@ void BannerObject::Unload()
     _legacyType.image = 0;
 }
 
-void BannerObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void BannerObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
 
     auto image0 = ImageId(_legacyType.image, COLOUR_BORDEAUX_RED);
     auto image1 = ImageId(_legacyType.image + 1, COLOUR_BORDEAUX_RED);
 
-    GfxDrawSprite(dpi, image0, screenCoords + ScreenCoordsXY{ -12, 8 });
-    GfxDrawSprite(dpi, image1, screenCoords + ScreenCoordsXY{ -12, 8 });
+    GfxDrawSprite(&dpi, image0, screenCoords + ScreenCoordsXY{ -12, 8 });
+    GfxDrawSprite(&dpi, image1, screenCoords + ScreenCoordsXY{ -12, 8 });
 }
 
 void BannerObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/BannerObject.h b/src/openrct2/object/BannerObject.h
index fe348f4bba..cec53e7d20 100644
--- a/src/openrct2/object/BannerObject.h
+++ b/src/openrct2/object/BannerObject.h
@@ -29,5 +29,5 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 };
diff --git a/src/openrct2/object/EntranceObject.cpp b/src/openrct2/object/EntranceObject.cpp
index e0a9343593..200d0615e6 100644
--- a/src/openrct2/object/EntranceObject.cpp
+++ b/src/openrct2/object/EntranceObject.cpp
@@ -42,13 +42,13 @@ void EntranceObject::Unload()
     _legacyType.image_id = 0;
 }
 
-void EntranceObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void EntranceObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
 
-    GfxDrawSprite(dpi, ImageId(_legacyType.image_id + 1), screenCoords + ScreenCoordsXY{ -32, 14 });
-    GfxDrawSprite(dpi, ImageId(_legacyType.image_id + 0), screenCoords + ScreenCoordsXY{ 0, 28 });
-    GfxDrawSprite(dpi, ImageId(_legacyType.image_id + 2), screenCoords + ScreenCoordsXY{ 32, 44 });
+    GfxDrawSprite(&dpi, ImageId(_legacyType.image_id + 1), screenCoords + ScreenCoordsXY{ -32, 14 });
+    GfxDrawSprite(&dpi, ImageId(_legacyType.image_id + 0), screenCoords + ScreenCoordsXY{ 0, 28 });
+    GfxDrawSprite(&dpi, ImageId(_legacyType.image_id + 2), screenCoords + ScreenCoordsXY{ 32, 44 });
 }
 
 void EntranceObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/EntranceObject.h b/src/openrct2/object/EntranceObject.h
index 3a0dbdf6a0..05000096b7 100644
--- a/src/openrct2/object/EntranceObject.h
+++ b/src/openrct2/object/EntranceObject.h
@@ -30,7 +30,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     ImageIndex GetImage(uint8_t sequence, Direction direction) const;
     uint8_t GetScrollingMode() const;
diff --git a/src/openrct2/object/FootpathItemObject.cpp b/src/openrct2/object/FootpathItemObject.cpp
index 4e82466c90..6cacf8f11d 100644
--- a/src/openrct2/object/FootpathItemObject.cpp
+++ b/src/openrct2/object/FootpathItemObject.cpp
@@ -80,10 +80,10 @@ void FootpathItemObject::Unload()
     _legacyType.image = 0;
 }
 
-void FootpathItemObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void FootpathItemObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
-    GfxDrawSprite(dpi, ImageId(_legacyType.image), screenCoords - ScreenCoordsXY{ 22, 24 });
+    GfxDrawSprite(&dpi, ImageId(_legacyType.image), screenCoords - ScreenCoordsXY{ 22, 24 });
 }
 
 static PathBitDrawType ParseDrawType(const std::string& s)
diff --git a/src/openrct2/object/FootpathItemObject.h b/src/openrct2/object/FootpathItemObject.h
index d3085292fd..2287b9e8aa 100644
--- a/src/openrct2/object/FootpathItemObject.h
+++ b/src/openrct2/object/FootpathItemObject.h
@@ -28,5 +28,5 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 };
diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp
index 9b4e6a41fa..e56217f441 100644
--- a/src/openrct2/object/FootpathObject.cpp
+++ b/src/openrct2/object/FootpathObject.cpp
@@ -69,11 +69,11 @@ void FootpathObject::Unload()
     _legacyType.image = 0;
 }
 
-void FootpathObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void FootpathObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
-    GfxDrawSprite(dpi, ImageId(_pathSurfaceDescriptor.PreviewImage), screenCoords - ScreenCoordsXY{ 49, 17 });
-    GfxDrawSprite(dpi, ImageId(_queueSurfaceDescriptor.PreviewImage), screenCoords + ScreenCoordsXY{ 4, -17 });
+    GfxDrawSprite(&dpi, ImageId(_pathSurfaceDescriptor.PreviewImage), screenCoords - ScreenCoordsXY{ 49, 17 });
+    GfxDrawSprite(&dpi, ImageId(_queueSurfaceDescriptor.PreviewImage), screenCoords + ScreenCoordsXY{ 4, -17 });
 }
 
 void FootpathObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/FootpathObject.h b/src/openrct2/object/FootpathObject.h
index c2ac12252b..137f090649 100644
--- a/src/openrct2/object/FootpathObject.h
+++ b/src/openrct2/object/FootpathObject.h
@@ -52,5 +52,5 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 };
diff --git a/src/openrct2/object/FootpathRailingsObject.cpp b/src/openrct2/object/FootpathRailingsObject.cpp
index ae4a58f4a1..d31f6790b9 100644
--- a/src/openrct2/object/FootpathRailingsObject.cpp
+++ b/src/openrct2/object/FootpathRailingsObject.cpp
@@ -47,7 +47,7 @@ void FootpathRailingsObject::Unload()
     RailingsImageId = 0;
 }
 
-void FootpathRailingsObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void FootpathRailingsObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto x = width / 2;
     auto y = height / 2;
@@ -61,20 +61,20 @@ void FootpathRailingsObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int3
         for (int i = 0; i < 2; i++)
         {
             auto h = i * 16;
-            GfxDrawSprite(dpi, img, { x - 8, y + 8 + h });
-            GfxDrawSprite(dpi, img, { x + 8, y + 16 + h });
+            GfxDrawSprite(&dpi, img, { x - 8, y + 8 + h });
+            GfxDrawSprite(&dpi, img, { x + 8, y + 16 + h });
         }
 
-        GfxDrawSprite(dpi, helper.WithIndex(BridgeImageId + 5), { x, y - 17 });
-        GfxDrawSprite(dpi, ImageId(RailingsImageId + 1), { x + 4, y - 14 });
-        GfxDrawSprite(dpi, ImageId(RailingsImageId + 1), { x + 27, y - 2 });
+        GfxDrawSprite(&dpi, helper.WithIndex(BridgeImageId + 5), { x, y - 17 });
+        GfxDrawSprite(&dpi, ImageId(RailingsImageId + 1), { x + 4, y - 14 });
+        GfxDrawSprite(&dpi, ImageId(RailingsImageId + 1), { x + 27, y - 2 });
     }
     else
     {
-        GfxDrawSprite(dpi, helper.WithIndex(BridgeImageId + 22), { x + 0, y + 16 });
-        GfxDrawSprite(dpi, helper.WithIndex(BridgeImageId + 49), { x, y - 17 });
-        GfxDrawSprite(dpi, ImageId(RailingsImageId + 1), { x + 4, y - 14 });
-        GfxDrawSprite(dpi, ImageId(RailingsImageId + 1), { x + 27, y - 3 });
+        GfxDrawSprite(&dpi, helper.WithIndex(BridgeImageId + 22), { x + 0, y + 16 });
+        GfxDrawSprite(&dpi, helper.WithIndex(BridgeImageId + 49), { x, y - 17 });
+        GfxDrawSprite(&dpi, ImageId(RailingsImageId + 1), { x + 4, y - 14 });
+        GfxDrawSprite(&dpi, ImageId(RailingsImageId + 1), { x + 27, y - 3 });
     }
 }
 
diff --git a/src/openrct2/object/FootpathRailingsObject.h b/src/openrct2/object/FootpathRailingsObject.h
index 84537bf7ec..c9e79327a7 100644
--- a/src/openrct2/object/FootpathRailingsObject.h
+++ b/src/openrct2/object/FootpathRailingsObject.h
@@ -30,7 +30,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     const PathRailingsDescriptor& GetDescriptor() const
     {
diff --git a/src/openrct2/object/FootpathSurfaceObject.cpp b/src/openrct2/object/FootpathSurfaceObject.cpp
index 2caf1a95be..9222fccb0b 100644
--- a/src/openrct2/object/FootpathSurfaceObject.cpp
+++ b/src/openrct2/object/FootpathSurfaceObject.cpp
@@ -43,12 +43,12 @@ void FootpathSurfaceObject::Unload()
     BaseImageId = 0;
 }
 
-void FootpathSurfaceObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void FootpathSurfaceObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2 - 16, height / 2 };
-    GfxDrawSprite(dpi, ImageId(BaseImageId + 3), screenCoords);
-    GfxDrawSprite(dpi, ImageId(BaseImageId + 16), { screenCoords.x + 32, screenCoords.y - 16 });
-    GfxDrawSprite(dpi, ImageId(BaseImageId + 8), { screenCoords.x + 32, screenCoords.y + 16 });
+    GfxDrawSprite(&dpi, ImageId(BaseImageId + 3), screenCoords);
+    GfxDrawSprite(&dpi, ImageId(BaseImageId + 16), { screenCoords.x + 32, screenCoords.y - 16 });
+    GfxDrawSprite(&dpi, ImageId(BaseImageId + 8), { screenCoords.x + 32, screenCoords.y + 16 });
 }
 
 void FootpathSurfaceObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/FootpathSurfaceObject.h b/src/openrct2/object/FootpathSurfaceObject.h
index 2079e85c05..44e4322ff0 100644
--- a/src/openrct2/object/FootpathSurfaceObject.h
+++ b/src/openrct2/object/FootpathSurfaceObject.h
@@ -26,7 +26,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     void SetRepositoryItem(ObjectRepositoryItem* item) const override;
 
diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp
index ec7fc03b94..71ae4bd9b9 100644
--- a/src/openrct2/object/LargeSceneryObject.cpp
+++ b/src/openrct2/object/LargeSceneryObject.cpp
@@ -143,7 +143,7 @@ void LargeSceneryObject::Unload()
     _baseImageId = _legacyType.image = 0;
 }
 
-void LargeSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void LargeSceneryObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, (height / 2) - 39 };
 
@@ -155,7 +155,7 @@ void LargeSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t
     if (_legacyType.flags & LARGE_SCENERY_FLAG_HAS_TERTIARY_COLOUR)
         image = image.WithTertiary(COLOUR_DARK_BROWN);
 
-    GfxDrawSprite(dpi, image, screenCoords);
+    GfxDrawSprite(&dpi, image, screenCoords);
 }
 
 std::vector<LargeSceneryTile> LargeSceneryObject::ReadTiles(OpenRCT2::IStream* stream)
diff --git a/src/openrct2/object/LargeSceneryObject.h b/src/openrct2/object/LargeSceneryObject.h
index f55ae33072..83aa29fa2c 100644
--- a/src/openrct2/object/LargeSceneryObject.h
+++ b/src/openrct2/object/LargeSceneryObject.h
@@ -34,7 +34,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
     const LargeSceneryTile* GetTileForSequence(uint8_t SequenceIndex) const;
 
 private:
diff --git a/src/openrct2/object/MusicObject.cpp b/src/openrct2/object/MusicObject.cpp
index 8e029bb90d..31ca1ff093 100644
--- a/src/openrct2/object/MusicObject.cpp
+++ b/src/openrct2/object/MusicObject.cpp
@@ -87,15 +87,15 @@ void MusicObject::Unload()
     NameStringId = 0;
 }
 
-void MusicObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void MusicObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     // Write (no image)
     int32_t x = width / 2;
     int32_t y = height / 2;
     if (_hasPreview)
-        GfxDrawSprite(dpi, ImageId(_previewImageId), { 0, 0 });
+        GfxDrawSprite(&dpi, ImageId(_previewImageId), { 0, 0 });
     else
-        DrawTextBasic(*dpi, { x, y }, STR_WINDOW_NO_IMAGE, {}, { TextAlignment::CENTRE });
+        DrawTextBasic(dpi, { x, y }, STR_WINDOW_NO_IMAGE, {}, { TextAlignment::CENTRE });
 }
 
 void MusicObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/MusicObject.h b/src/openrct2/object/MusicObject.h
index b32b81189b..73a82eba92 100644
--- a/src/openrct2/object/MusicObject.h
+++ b/src/openrct2/object/MusicObject.h
@@ -59,7 +59,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     std::optional<uint8_t> GetOriginalStyleId() const;
     bool SupportsRideType(ride_type_t rideType);
diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h
index 555a39f797..bdc23c8787 100644
--- a/src/openrct2/object/Object.h
+++ b/src/openrct2/object/Object.h
@@ -286,7 +286,7 @@ public:
     virtual void Load() abstract;
     virtual void Unload() abstract;
 
-    virtual void DrawPreview(DrawPixelInfo* /*dpi*/, int32_t /*width*/, int32_t /*height*/) const
+    virtual void DrawPreview(DrawPixelInfo& /*dpi*/, int32_t /*width*/, int32_t /*height*/) const
     {
     }
 
diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index 305e64fa5b..d5460a66d2 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -334,7 +334,7 @@ void RideObject::Unload()
     _legacyType.images_offset = 0;
 }
 
-void RideObject::DrawPreview(DrawPixelInfo* dpi, [[maybe_unused]] int32_t width, [[maybe_unused]] int32_t height) const
+void RideObject::DrawPreview(DrawPixelInfo& dpi, [[maybe_unused]] int32_t width, [[maybe_unused]] int32_t height) const
 {
     uint32_t imageId = _legacyType.images_offset;
 
@@ -346,7 +346,7 @@ void RideObject::DrawPreview(DrawPixelInfo* dpi, [[maybe_unused]] int32_t width,
         imageId++;
     }
 
-    GfxDrawSprite(dpi, ImageId(imageId), { 0, 0 });
+    GfxDrawSprite(&dpi, ImageId(imageId), { 0, 0 });
 }
 
 std::string RideObject::GetDescription() const
diff --git a/src/openrct2/object/RideObject.h b/src/openrct2/object/RideObject.h
index f6c619022f..0acdccce00 100644
--- a/src/openrct2/object/RideObject.h
+++ b/src/openrct2/object/RideObject.h
@@ -36,7 +36,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     std::string GetDescription() const;
     std::string GetCapacity() const;
diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp
index f19c876a29..3c0b11ba21 100644
--- a/src/openrct2/object/SceneryGroupObject.cpp
+++ b/src/openrct2/object/SceneryGroupObject.cpp
@@ -71,12 +71,12 @@ void SceneryGroupObject::Unload()
     _legacyType.image = 0;
 }
 
-void SceneryGroupObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void SceneryGroupObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
 
     const auto imageId = ImageId(_legacyType.image + 1, COLOUR_DARK_GREEN);
-    GfxDrawSprite(dpi, imageId, screenCoords - ScreenCoordsXY{ 15, 14 });
+    GfxDrawSprite(&dpi, imageId, screenCoords - ScreenCoordsXY{ 15, 14 });
 }
 
 static std::optional<uint8_t> GetSceneryType(const ObjectType type)
diff --git a/src/openrct2/object/SceneryGroupObject.h b/src/openrct2/object/SceneryGroupObject.h
index ca385ee3ce..9f1307889c 100644
--- a/src/openrct2/object/SceneryGroupObject.h
+++ b/src/openrct2/object/SceneryGroupObject.h
@@ -36,7 +36,7 @@ public:
     void Unload() override;
     void UpdateEntryIndexes();
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     void SetRepositoryItem(ObjectRepositoryItem* item) const override;
 
diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp
index 9587ca9a8e..6f7751a02f 100644
--- a/src/openrct2/object/SmallSceneryObject.cpp
+++ b/src/openrct2/object/SmallSceneryObject.cpp
@@ -95,7 +95,7 @@ void SmallSceneryObject::Unload()
     _legacyType.image = 0;
 }
 
-void SmallSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void SmallSceneryObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto imageId = ImageId(_legacyType.image);
     if (_legacyType.HasFlag(SMALL_SCENERY_FLAG_HAS_PRIMARY_COLOUR))
@@ -119,12 +119,12 @@ void SmallSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t
         screenCoords.y -= 12;
     }
 
-    GfxDrawSprite(dpi, imageId, screenCoords);
+    GfxDrawSprite(&dpi, imageId, screenCoords);
 
     if (_legacyType.HasFlag(SMALL_SCENERY_FLAG_HAS_GLASS))
     {
         imageId = ImageId(_legacyType.image + 4).WithTransparency(COLOUR_BORDEAUX_RED);
-        GfxDrawSprite(dpi, imageId, screenCoords);
+        GfxDrawSprite(&dpi, imageId, screenCoords);
     }
 
     if (_legacyType.HasFlag(SMALL_SCENERY_FLAG_ANIMATED_FG))
@@ -134,7 +134,7 @@ void SmallSceneryObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t
         {
             imageId = imageId.WithSecondary(COLOUR_YELLOW);
         }
-        GfxDrawSprite(dpi, imageId, screenCoords);
+        GfxDrawSprite(&dpi, imageId, screenCoords);
     }
 }
 
diff --git a/src/openrct2/object/SmallSceneryObject.h b/src/openrct2/object/SmallSceneryObject.h
index 8b531418c9..635c388a8c 100644
--- a/src/openrct2/object/SmallSceneryObject.h
+++ b/src/openrct2/object/SmallSceneryObject.h
@@ -32,7 +32,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
 private:
     static std::vector<uint8_t> ReadFrameOffsets(OpenRCT2::IStream* stream);
diff --git a/src/openrct2/object/StationObject.cpp b/src/openrct2/object/StationObject.cpp
index b461d72362..92d444f094 100644
--- a/src/openrct2/object/StationObject.cpp
+++ b/src/openrct2/object/StationObject.cpp
@@ -45,7 +45,7 @@ void StationObject::Unload()
     ShelterImageId = ImageIndexUndefined;
 }
 
-void StationObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void StationObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, (height / 2) + 16 };
 
@@ -64,16 +64,16 @@ void StationObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t heigh
         imageId = imageId.WithSecondary(colour1);
     }
 
-    GfxDrawSprite(dpi, imageId, screenCoords);
+    GfxDrawSprite(&dpi, imageId, screenCoords);
     if (Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
     {
-        GfxDrawSprite(dpi, tImageId, screenCoords);
+        GfxDrawSprite(&dpi, tImageId, screenCoords);
     }
 
-    GfxDrawSprite(dpi, imageId.WithIndexOffset(4), screenCoords);
+    GfxDrawSprite(&dpi, imageId.WithIndexOffset(4), screenCoords);
     if (Flags & STATION_OBJECT_FLAGS::IS_TRANSPARENT)
     {
-        GfxDrawSprite(dpi, tImageId.WithIndexOffset(4), screenCoords);
+        GfxDrawSprite(&dpi, tImageId.WithIndexOffset(4), screenCoords);
     }
 }
 
diff --git a/src/openrct2/object/StationObject.h b/src/openrct2/object/StationObject.h
index 45389ece71..ff6e2fefeb 100644
--- a/src/openrct2/object/StationObject.h
+++ b/src/openrct2/object/StationObject.h
@@ -35,5 +35,5 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 };
diff --git a/src/openrct2/object/TerrainEdgeObject.cpp b/src/openrct2/object/TerrainEdgeObject.cpp
index 2dc4f9af7f..501951d7c5 100644
--- a/src/openrct2/object/TerrainEdgeObject.cpp
+++ b/src/openrct2/object/TerrainEdgeObject.cpp
@@ -38,13 +38,13 @@ void TerrainEdgeObject::Unload()
     BaseImageId = 0;
 }
 
-void TerrainEdgeObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void TerrainEdgeObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
 
     auto imageId = ImageId(BaseImageId + 5);
-    GfxDrawSprite(dpi, imageId, screenCoords + ScreenCoordsXY{ 8, -8 });
-    GfxDrawSprite(dpi, imageId, screenCoords + ScreenCoordsXY{ 8, 8 });
+    GfxDrawSprite(&dpi, imageId, screenCoords + ScreenCoordsXY{ 8, -8 });
+    GfxDrawSprite(&dpi, imageId, screenCoords + ScreenCoordsXY{ 8, 8 });
 }
 
 void TerrainEdgeObject::ReadJson(IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/TerrainEdgeObject.h b/src/openrct2/object/TerrainEdgeObject.h
index 71adcabde3..6e9cf5fd62 100644
--- a/src/openrct2/object/TerrainEdgeObject.h
+++ b/src/openrct2/object/TerrainEdgeObject.h
@@ -24,7 +24,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     static TerrainEdgeObject* GetById(ObjectEntryIndex entryIndex);
 };
diff --git a/src/openrct2/object/TerrainSurfaceObject.cpp b/src/openrct2/object/TerrainSurfaceObject.cpp
index 5740816776..c5d05cca06 100644
--- a/src/openrct2/object/TerrainSurfaceObject.cpp
+++ b/src/openrct2/object/TerrainSurfaceObject.cpp
@@ -50,7 +50,7 @@ void TerrainSurfaceObject::Unload()
     NumEntries = 0;
 }
 
-void TerrainSurfaceObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void TerrainSurfaceObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto imageId = ImageId(GetImageId({}, 1, 0, 0, false, false));
     if (Colour != 255)
@@ -70,7 +70,7 @@ void TerrainSurfaceObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_
         }
         for (int32_t j = 0; j < 4; j++)
         {
-            GfxDrawSprite(dpi, imageId, screenCoords);
+            GfxDrawSprite(&dpi, imageId, screenCoords);
             screenCoords.x += 64;
         }
         screenCoords.y += 16;
diff --git a/src/openrct2/object/TerrainSurfaceObject.h b/src/openrct2/object/TerrainSurfaceObject.h
index 38e0e55542..e8d5459f22 100644
--- a/src/openrct2/object/TerrainSurfaceObject.h
+++ b/src/openrct2/object/TerrainSurfaceObject.h
@@ -59,7 +59,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
     uint32_t GetImageId(
         const CoordsXY& position, int32_t length, int32_t rotation, int32_t offset, bool grid, bool underground) const;
diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp
index 5fa1c2f51a..7be62c1abe 100644
--- a/src/openrct2/object/WallObject.cpp
+++ b/src/openrct2/object/WallObject.cpp
@@ -68,7 +68,7 @@ void WallObject::Unload()
     _legacyType.image = 0;
 }
 
-void WallObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void WallObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
 
@@ -81,16 +81,16 @@ void WallObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height)
         imageId = imageId.WithSecondary(COLOUR_YELLOW);
     }
 
-    GfxDrawSprite(dpi, imageId, screenCoords);
+    GfxDrawSprite(&dpi, imageId, screenCoords);
 
     if (_legacyType.flags & WALL_SCENERY_HAS_GLASS)
     {
         auto glassImageId = imageId.WithTransparency(COLOUR_BORDEAUX_RED).WithIndexOffset(6);
-        GfxDrawSprite(dpi, glassImageId, screenCoords);
+        GfxDrawSprite(&dpi, glassImageId, screenCoords);
     }
     else if (_legacyType.flags & WALL_SCENERY_IS_DOOR)
     {
-        GfxDrawSprite(dpi, imageId.WithIndexOffset(1), screenCoords);
+        GfxDrawSprite(&dpi, imageId.WithIndexOffset(1), screenCoords);
     }
 }
 
diff --git a/src/openrct2/object/WallObject.h b/src/openrct2/object/WallObject.h
index ccae049136..dace16c8ca 100644
--- a/src/openrct2/object/WallObject.h
+++ b/src/openrct2/object/WallObject.h
@@ -28,5 +28,5 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 };
diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp
index cebed8bb37..ded14e80c5 100644
--- a/src/openrct2/object/WaterObject.cpp
+++ b/src/openrct2/object/WaterObject.cpp
@@ -54,11 +54,11 @@ void WaterObject::Unload()
     _legacyType.image_id = 0;
 }
 
-void WaterObject::DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const
+void WaterObject::DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const
 {
     // Write (no image)
     auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
-    DrawTextBasic(*dpi, screenCoords, STR_WINDOW_NO_IMAGE, {}, { TextAlignment::CENTRE });
+    DrawTextBasic(dpi, screenCoords, STR_WINDOW_NO_IMAGE, {}, { TextAlignment::CENTRE });
 }
 
 void WaterObject::ReadJson([[maybe_unused]] IReadObjectContext* context, json_t& root)
diff --git a/src/openrct2/object/WaterObject.h b/src/openrct2/object/WaterObject.h
index 6a9cee3cbe..6d6bf7f026 100644
--- a/src/openrct2/object/WaterObject.h
+++ b/src/openrct2/object/WaterObject.h
@@ -30,7 +30,7 @@ public:
     void Load() override;
     void Unload() override;
 
-    void DrawPreview(DrawPixelInfo* dpi, int32_t width, int32_t height) const override;
+    void DrawPreview(DrawPixelInfo& dpi, int32_t width, int32_t height) const override;
 
 private:
     void ReadJsonPalette(json_t& jPalette);