Fix type issues with string parameter structs

JGRennison · Nov 9, 2023 · 48e700b · 48e700b
1 parent fe57f3a
commit 48e700b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/src/error.h b/src/error.h
@@ -10,11 +10,12 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-#include <list>
 #include "strings_type.h"
 #include "company_type.h"
 #include "core/geometry_type.hpp"
 #include "guitimer_func.h"
+#include <list>
+#include <vector>
 
 struct GRFFile;
 

diff --git a/src/newgrf_text.h b/src/newgrf_text.h
@@ -54,7 +54,7 @@ bool UsingNewGRFTextStack();
 struct TextRefStack *CreateTextRefStackBackup();
 void RestoreTextRefStackBackup(struct TextRefStack *backup);
 
-struct StringParameters;
+class StringParameters;
 uint RemapNewGRFStringControlCode(uint scc, char *buf_start, char **buff, const char **str, StringParameters &parameters, bool modify_parameters);
 
 /** Mapping of language data between a NewGRF and OpenTTD. */

diff --git a/src/news_type.h b/src/news_type.h
@@ -14,6 +14,7 @@
 #include "date_type.h"
 #include "strings_type.h"
 #include "sound_type.h"
+#include <vector>
 
 /**
  * Type of news.

diff --git a/src/strings_func.h b/src/strings_func.h
@@ -19,6 +19,7 @@
 #include "vehicle_type.h"
 #include <array>
 #include <optional>
+#include <vector>
 
 extern ArrayStringParameters<20> _global_string_params;
 

diff --git a/src/strings_internal.h b/src/strings_internal.h
@@ -197,20 +197,6 @@ class StringParameters {
 	}
 };
 
-/**
- * Extension of StringParameters with its own statically allocated buffer for
- * the parameters.
- */
-class AllocatedStringParameters : public StringParameters {
-	std::vector<StringParameter> params; ///< The actual parameters
-
-public:
-	AllocatedStringParameters(size_t parameters = 0) : params(parameters)
-	{
-		this->parameters = span(params.data(), params.size());
-	}
-};
-
 /**
  * Extension of StringParameters with its own statically sized buffer for
  * the parameters.