Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-source.yml # .github/workflows/release.yml # CMakeLists.txt # COMPILING.md # src/ai/ai_core.cpp # src/ai/ai_gui.cpp # src/bridge_gui.cpp # src/company_gui.cpp # src/console_cmds.cpp # src/core/CMakeLists.txt # src/core/smallmap_type.hpp # src/disaster_vehicle.h # src/effectvehicle_base.h # src/fontcache.cpp # src/game/game_core.cpp # src/game/game_gui.cpp # src/gamelog.cpp # src/gamelog_internal.h # src/group_gui.cpp # src/linkgraph/linkgraph.h # src/misc.cpp # src/network/core/config.h # src/network/core/udp.cpp # src/network/network_chat_gui.cpp # src/network/network_content_gui.cpp # src/network/network_gui.cpp # src/newgrf.cpp # src/newgrf_gui.cpp # src/newgrf_profiling.cpp # src/newgrf_profiling.h # src/object_gui.cpp # src/openttd.cpp # src/openttd.h # src/order_gui.cpp # src/os/windows/font_win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/script/api/script_controller.cpp # src/script/api/script_roadtypelist.cpp # src/script/script_config.cpp # src/script/script_config.hpp # src/script/script_instance.cpp # src/script/script_scanner.cpp # src/script/squirrel.cpp # src/script/squirrel_helper.hpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_type.h # src/table/settings/network_private_settings.ini # src/timetable_gui.cpp # src/vehicle.cpp # src/vehicle_base.h # src/window_gui.h
This commit is contained in:
@@ -131,7 +131,7 @@ public:
|
||||
* @param name The name of the setting.
|
||||
* @return the value for the setting, or -1 if the setting is not known.
|
||||
*/
|
||||
static int GetSetting(const char *name);
|
||||
static int GetSetting(const std::string &name);
|
||||
|
||||
/**
|
||||
* Get the OpenTTD version of this executable. The version is formatted
|
||||
@@ -187,7 +187,7 @@ public:
|
||||
* @note gui.ai_developer_tools setting must be enabled or the break is
|
||||
* ignored.
|
||||
*/
|
||||
static void Break(const char* message);
|
||||
static void Break(const std::string &message);
|
||||
|
||||
/**
|
||||
* When Squirrel triggers a print, this function is called.
|
||||
@@ -196,7 +196,7 @@ public:
|
||||
* @param message The message Squirrel logged.
|
||||
* @note Use ScriptLog.Info/Warning/Error instead of 'print'.
|
||||
*/
|
||||
static void Print(bool error_msg, const char *message);
|
||||
static void Print(bool error_msg, const std::string &message);
|
||||
|
||||
/**
|
||||
* Import a library.
|
||||
@@ -207,7 +207,7 @@ public:
|
||||
* @return The loaded library object. If class_name is set, it is also available (under the scope of the import) under that name.
|
||||
* @note This command can be called from the global space, and does not need an instance.
|
||||
*/
|
||||
static HSQOBJECT Import(const char *library, const char *class_name, int version);
|
||||
static HSQOBJECT Import(const std::string &library, const std::string &class_name, int version);
|
||||
|
||||
private:
|
||||
typedef std::map<std::string, std::string, CaseInsensitiveComparator> LoadedLibraryList; ///< The type for loaded libraries.
|
||||
|
Reference in New Issue
Block a user