dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-03-04 16:44:23 +00:00
parent 4ec6a99dd8 87f4d37de3
commit 2ea1766677
94 changed files with 1075 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/script/api/script_text.hpp
View File

@@ -13,6 +13,8 @@
#include "script_object.hpp"
#include "../../core/alloc_type.hpp"
#include <variant>
/**
* Internal parent object of all Text-like objects.
* @api -all
@@ -88,7 +90,6 @@ public:
*/
ScriptText(StringID string, ...);
#endif /* DOXYGEN_API */
~ScriptText();
#ifndef DOXYGEN_API
/**
@@ -127,10 +128,10 @@ public:
virtual const std::string GetEncodedText();
private:
using ScriptTextRef = ScriptObjectRef<ScriptText>;
StringID string;
char *params[SCRIPT_TEXT_MAX_PARAMETERS];
int64 parami[SCRIPT_TEXT_MAX_PARAMETERS];
ScriptText *paramt[SCRIPT_TEXT_MAX_PARAMETERS];
std::variant<SQInteger, std::string, ScriptTextRef> param[SCRIPT_TEXT_MAX_PARAMETERS];
int paramc;
/**