From 3b8f97cc41a0b522f9eb8fa7c41f0993c2adb622 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 21 May 2025 22:15:56 -0500
Subject: [PATCH] [nostalgia/gfx] Cleanup

---
 .../gfx/include/nostalgia/gfx/context.hpp       |  4 ----
 .../modules/gfx/include/nostalgia/gfx/gfx.hpp   |  9 ++++++++-
 .../gfx/include/nostalgia/gfx/initparams.hpp    | 17 -----------------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 src/nostalgia/modules/gfx/include/nostalgia/gfx/initparams.hpp

diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/context.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/context.hpp
index d4448e2e..d408df95 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/context.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/context.hpp
@@ -8,16 +8,12 @@
 
 #include <turbine/context.hpp>
 
-#include "initparams.hpp"
-
 namespace nostalgia::gfx {
 
 class Context;
 
 void safeDelete(Context *ctx) noexcept;
 
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
-
 keel::Context &keelCtx(Context &ctx) noexcept;
 
 turbine::Context &turbineCtx(Context &ctx) noexcept;
diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
index 8f265d8c..ccde7b09 100644
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
+++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp
@@ -11,7 +11,6 @@
 
 #include "color.hpp"
 #include "context.hpp"
-#include "initparams.hpp"
 #include "keelmodule.hpp"
 #include "palette.hpp"
 #include "ptidxconv.hpp"
@@ -106,6 +105,14 @@ OX_MODEL_BEGIN(TileSheetSet)
 	OX_MODEL_FIELD(entries)
 OX_MODEL_END()
 
+struct InitParams {
+	bool glInstallDrawer = true;
+	uint_t glSpriteCount = 128;
+	uint_t glBlocksPerSprite = 64;
+};
+
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
+
 [[nodiscard]]
 int tileColumns(Context&) noexcept;
 
diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/initparams.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/initparams.hpp
deleted file mode 100644
index e7145d37..00000000
--- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/initparams.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-namespace nostalgia::gfx {
-
-struct InitParams {
-	bool glInstallDrawer = true;
-	uint_t glSpriteCount = 128;
-	uint_t glBlocksPerSprite = 64;
-};
-
-}