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:
@@ -84,13 +84,13 @@ public:
|
||||
* @param script The full script-name to load.
|
||||
* @return False if loading failed.
|
||||
*/
|
||||
bool LoadScript(const char *script);
|
||||
bool LoadScript(HSQUIRRELVM vm, const char *script, bool in_root = true);
|
||||
bool LoadScript(const std::string &script);
|
||||
bool LoadScript(HSQUIRRELVM vm, const std::string &script, bool in_root = true);
|
||||
|
||||
/**
|
||||
* Load a file to a given VM.
|
||||
*/
|
||||
SQRESULT LoadFile(HSQUIRRELVM vm, const char *filename, SQBool printerror);
|
||||
SQRESULT LoadFile(HSQUIRRELVM vm, const std::string &filename, SQBool printerror);
|
||||
|
||||
/**
|
||||
* Adds a function to the stack. Depending on the current state this means
|
||||
@@ -159,7 +159,7 @@ public:
|
||||
*/
|
||||
bool CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend);
|
||||
bool CallMethod(HSQOBJECT instance, const char *method_name, int suspend) { return this->CallMethod(instance, method_name, nullptr, suspend); }
|
||||
bool CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, const char **res, int suspend);
|
||||
bool CallStringMethod(HSQOBJECT instance, const char *method_name, std::string *res, int suspend);
|
||||
bool CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend);
|
||||
bool CallBoolMethod(HSQOBJECT instance, const char *method_name, bool *res, int suspend);
|
||||
|
||||
@@ -178,12 +178,12 @@ public:
|
||||
* @param prepend_API_name Optional parameter; if true, the class_name is prefixed with the current API name.
|
||||
* @return False if creating failed.
|
||||
*/
|
||||
static bool CreateClassInstanceVM(HSQUIRRELVM vm, const char *class_name, void *real_instance, HSQOBJECT *instance, SQRELEASEHOOK release_hook, bool prepend_API_name = false);
|
||||
static bool CreateClassInstanceVM(HSQUIRRELVM vm, const std::string &class_name, void *real_instance, HSQOBJECT *instance, SQRELEASEHOOK release_hook, bool prepend_API_name = false);
|
||||
|
||||
/**
|
||||
* Exactly the same as CreateClassInstanceVM, only callable without instance of Squirrel.
|
||||
*/
|
||||
bool CreateClassInstance(const char *class_name, void *real_instance, HSQOBJECT *instance);
|
||||
bool CreateClassInstance(const std::string &class_name, void *real_instance, HSQOBJECT *instance);
|
||||
|
||||
/**
|
||||
* Get the real-instance pointer.
|
||||
@@ -233,7 +233,7 @@ public:
|
||||
/**
|
||||
* Throw a Squirrel error that will be nicely displayed to the user.
|
||||
*/
|
||||
void ThrowError(const char *error) { sq_throwerror(this->vm, error); }
|
||||
void ThrowError(const std::string_view error) { sq_throwerror(this->vm, error); }
|
||||
|
||||
/**
|
||||
* Release a SQ object.
|
||||
|
Reference in New Issue
Block a user