diff --git a/scripts/natives_gen.py b/scripts/natives_gen.py index 18bfbd1a..39121603 100644 --- a/scripts/natives_gen.py +++ b/scripts/natives_gen.py @@ -1,6 +1,9 @@ +# working dir: scripts +# python ./natives_gen.py + import os -natives_hpp = open("../../natives.hpp", "r") +natives_hpp = open("../src/natives.hpp", "r") cpp_print_buf = "" hpp_print_buf = "" @@ -22,6 +25,11 @@ class Arg: def __init__(self, name, type_): self.name = name self.type_ = type_.replace("BOOL", "bool") + if self.type_ == "const char*": + self.type_ = self.type_.replace("const char*", "sol::stack_object") + self.is_string = True + else: + self.is_string = False self.is_pointer_arg = "*" in type_ and "const char" not in type_ self.type_no_star = self.type_.replace("*", "") @@ -61,7 +69,7 @@ class NativeFunc: if out_param.is_pointer_arg: fixed_return += out_param.type_no_star + ", " else: - fixed_return += out_param.type_ + ", " + fixed_return += ("const char*" if out_param.is_string else out_param.type_) + ", " fixed_return = fixed_return[:-2] + ">" returning_multiple_values = True tuple_type = fixed_return @@ -69,7 +77,7 @@ class NativeFunc: if self.out_params[0].is_pointer_arg: fixed_return = self.out_params[0].type_no_star else: - fixed_return = self.out_params[0].type_ + fixed_return = ("const char*" if self.out_params[0].is_string else self.out_params[0].type_) fixed_params = "" if len(self.args) > 0: @@ -123,7 +131,10 @@ class NativeFunc: call_native += "(BOOL*)" call_native += "&" - call_native += arg.name + ", " + if arg.is_string: + call_native += f'{arg.name}.is() ? {arg.name}.as() : nullptr, ' + else: + call_native += arg.name + ", " call_native = call_native[:-2] call_native += ");" @@ -184,7 +195,8 @@ def get_natives_func_from_natives_hpp_file(natives_hpp): if "namespace " in line: current_namespace = line.replace("namespace ", "").strip() functions_per_namespaces[current_namespace] = [] - elif "NATIVE_DECL" in line: + elif "FORCEINLINE constexpr" in line: + line = line.replace("FORCEINLINE constexpr", "") words = line.split() # remove NATIVE_DECL from the words array @@ -258,7 +270,7 @@ def generate_native_binding_cpp_and_hpp_files(functions_per_namespaces): for namespace_name, native_funcs in functions_per_namespaces.items(): - file_name_cpp = "lua_native_binding_" + namespace_name + ".cpp" + file_name_cpp = "../src/lua/natives/lua_native_binding_" + namespace_name + ".cpp" if os.path.exists(file_name_cpp): os.remove(file_name_cpp) f = open(file_name_cpp, "a") @@ -309,7 +321,7 @@ def generate_native_binding_cpp_and_hpp_files(functions_per_namespaces): generate_native_binding_cpp_and_hpp_files(functions_per_namespaces) def write_cpp_code(cpp_print_buf): - file_name = "lua_native_binding.cpp" + file_name = "../src/lua/natives/lua_native_binding.cpp" if os.path.exists(file_name): os.remove(file_name) f = open(file_name, "a") @@ -318,7 +330,7 @@ def write_cpp_code(cpp_print_buf): def write_hpp_code(hpp_print_buf): - file_name = "lua_native_binding.hpp" + file_name = "../src/lua/natives/lua_native_binding.hpp" if os.path.exists(file_name): os.remove(file_name) f = open(file_name, "a") diff --git a/src/lua/natives/lua_native_binding_APP.cpp b/src/lua/natives/lua_native_binding_APP.cpp index 4285c2b5..04bf02e2 100644 --- a/src/lua/natives/lua_native_binding_APP.cpp +++ b/src/lua/natives/lua_native_binding_APP.cpp @@ -9,47 +9,47 @@ namespace lua::native return retval; } - static int LUA_NATIVE_APP_APP_GET_INT(const char* property) + static int LUA_NATIVE_APP_APP_GET_INT(sol::stack_object property) { - auto retval = APP::APP_GET_INT(property); + auto retval = APP::APP_GET_INT(property.is() ? property.as() : nullptr); return retval; } - static float LUA_NATIVE_APP_APP_GET_FLOAT(const char* property) + static float LUA_NATIVE_APP_APP_GET_FLOAT(sol::stack_object property) { - auto retval = APP::APP_GET_FLOAT(property); + auto retval = APP::APP_GET_FLOAT(property.is() ? property.as() : nullptr); return retval; } - static const char* LUA_NATIVE_APP_APP_GET_STRING(const char* property) + static const char* LUA_NATIVE_APP_APP_GET_STRING(sol::stack_object property) { - auto retval = APP::APP_GET_STRING(property); + auto retval = APP::APP_GET_STRING(property.is() ? property.as() : nullptr); return retval; } - static void LUA_NATIVE_APP_APP_SET_INT(const char* property, int value) + static void LUA_NATIVE_APP_APP_SET_INT(sol::stack_object property, int value) { - APP::APP_SET_INT(property, value); + APP::APP_SET_INT(property.is() ? property.as() : nullptr, value); } - static void LUA_NATIVE_APP_APP_SET_FLOAT(const char* property, float value) + static void LUA_NATIVE_APP_APP_SET_FLOAT(sol::stack_object property, float value) { - APP::APP_SET_FLOAT(property, value); + APP::APP_SET_FLOAT(property.is() ? property.as() : nullptr, value); } - static void LUA_NATIVE_APP_APP_SET_STRING(const char* property, const char* value) + static void LUA_NATIVE_APP_APP_SET_STRING(sol::stack_object property, sol::stack_object value) { - APP::APP_SET_STRING(property, value); + APP::APP_SET_STRING(property.is() ? property.as() : nullptr, value.is() ? value.as() : nullptr); } - static void LUA_NATIVE_APP_APP_SET_APP(const char* appName) + static void LUA_NATIVE_APP_APP_SET_APP(sol::stack_object appName) { - APP::APP_SET_APP(appName); + APP::APP_SET_APP(appName.is() ? appName.as() : nullptr); } - static void LUA_NATIVE_APP_APP_SET_BLOCK(const char* blockName) + static void LUA_NATIVE_APP_APP_SET_BLOCK(sol::stack_object blockName) { - APP::APP_SET_BLOCK(blockName); + APP::APP_SET_BLOCK(blockName.is() ? blockName.as() : nullptr); } static void LUA_NATIVE_APP_APP_CLEAR_BLOCK() @@ -73,9 +73,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_APP_APP_HAS_SYNCED_DATA(const char* appName) + static bool LUA_NATIVE_APP_APP_HAS_SYNCED_DATA(sol::stack_object appName) { - auto retval = (bool)APP::APP_HAS_SYNCED_DATA(appName); + auto retval = (bool)APP::APP_HAS_SYNCED_DATA(appName.is() ? appName.as() : nullptr); return retval; } @@ -90,9 +90,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_APP_APP_DELETE_APP_DATA(const char* appName) + static bool LUA_NATIVE_APP_APP_DELETE_APP_DATA(sol::stack_object appName) { - auto retval = (bool)APP::APP_DELETE_APP_DATA(appName); + auto retval = (bool)APP::APP_DELETE_APP_DATA(appName.is() ? appName.as() : nullptr); return retval; } diff --git a/src/lua/natives/lua_native_binding_AUDIO.cpp b/src/lua/natives/lua_native_binding_AUDIO.cpp index 9cc883e0..9b2a27a1 100644 --- a/src/lua/natives/lua_native_binding_AUDIO.cpp +++ b/src/lua/natives/lua_native_binding_AUDIO.cpp @@ -3,9 +3,9 @@ namespace lua::native { - static void LUA_NATIVE_AUDIO_PLAY_PED_RINGTONE(const char* ringtoneName, Ped ped, bool p2) + static void LUA_NATIVE_AUDIO_PLAY_PED_RINGTONE(sol::stack_object ringtoneName, Ped ped, bool p2) { - AUDIO::PLAY_PED_RINGTONE(ringtoneName, ped, p2); + AUDIO::PLAY_PED_RINGTONE(ringtoneName.is() ? ringtoneName.as() : nullptr, ped, p2); } static bool LUA_NATIVE_AUDIO_IS_PED_RINGTONE_PLAYING(Ped ped) @@ -31,19 +31,25 @@ namespace lua::native return retval; } + static int LUA_NATIVE_AUDIO_GET_CURRENT_TV_SHOW_PLAY_TIME() + { + auto retval = AUDIO::GET_CURRENT_TV_SHOW_PLAY_TIME(); + return retval; + } + static void LUA_NATIVE_AUDIO_CREATE_NEW_SCRIPTED_CONVERSATION() { AUDIO::CREATE_NEW_SCRIPTED_CONVERSATION(); } - static void LUA_NATIVE_AUDIO_ADD_LINE_TO_CONVERSATION(int index, const char* p1, const char* p2, int p3, int p4, bool p5, bool p6, bool p7, bool p8, int p9, bool p10, bool p11, bool p12) + static void LUA_NATIVE_AUDIO_ADD_LINE_TO_CONVERSATION(int index, sol::stack_object p1, sol::stack_object p2, int p3, int p4, bool p5, bool p6, bool p7, bool p8, int p9, bool p10, bool p11, bool p12) { - AUDIO::ADD_LINE_TO_CONVERSATION(index, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); + AUDIO::ADD_LINE_TO_CONVERSATION(index, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } - static void LUA_NATIVE_AUDIO_ADD_PED_TO_CONVERSATION(int index, Ped ped, const char* p2) + static void LUA_NATIVE_AUDIO_ADD_PED_TO_CONVERSATION(int index, Ped ped, sol::stack_object p2) { - AUDIO::ADD_PED_TO_CONVERSATION(index, ped, p2); + AUDIO::ADD_PED_TO_CONVERSATION(index, ped, p2.is() ? p2.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_POSITION_FOR_NULL_CONV_PED(Any p0, float p1, float p2, float p3) @@ -141,14 +147,14 @@ namespace lua::native AUDIO::SKIP_TO_NEXT_SCRIPTED_CONVERSATION_LINE(); } - static void LUA_NATIVE_AUDIO_INTERRUPT_CONVERSATION(Ped ped, const char* voiceline, const char* speaker) + static void LUA_NATIVE_AUDIO_INTERRUPT_CONVERSATION(Ped ped, sol::stack_object voiceline, sol::stack_object speaker) { - AUDIO::INTERRUPT_CONVERSATION(ped, voiceline, speaker); + AUDIO::INTERRUPT_CONVERSATION(ped, voiceline.is() ? voiceline.as() : nullptr, speaker.is() ? speaker.as() : nullptr); } - static void LUA_NATIVE_AUDIO_INTERRUPT_CONVERSATION_AND_PAUSE(Ped ped, const char* p1, const char* speaker) + static void LUA_NATIVE_AUDIO_INTERRUPT_CONVERSATION_AND_PAUSE(Ped ped, sol::stack_object p1, sol::stack_object speaker) { - AUDIO::INTERRUPT_CONVERSATION_AND_PAUSE(ped, p1, speaker); + AUDIO::INTERRUPT_CONVERSATION_AND_PAUSE(ped, p1.is() ? p1.as() : nullptr, speaker.is() ? speaker.as() : nullptr); } static std::tuple LUA_NATIVE_AUDIO_GET_VARIATION_CHOSEN_FOR_SCRIPTED_LINE(Any p0) @@ -175,39 +181,39 @@ namespace lua::native AUDIO::UNREGISTER_SCRIPT_WITH_AUDIO(); } - static bool LUA_NATIVE_AUDIO_REQUEST_MISSION_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_REQUEST_MISSION_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::REQUEST_MISSION_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::REQUEST_MISSION_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } - static bool LUA_NATIVE_AUDIO_REQUEST_AMBIENT_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_REQUEST_AMBIENT_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::REQUEST_AMBIENT_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::REQUEST_AMBIENT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } - static bool LUA_NATIVE_AUDIO_REQUEST_SCRIPT_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_REQUEST_SCRIPT_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::REQUEST_SCRIPT_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::REQUEST_SCRIPT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } - static bool LUA_NATIVE_AUDIO_HINT_MISSION_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_HINT_MISSION_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::HINT_MISSION_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::HINT_MISSION_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } - static bool LUA_NATIVE_AUDIO_HINT_AMBIENT_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_HINT_AMBIENT_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::HINT_AMBIENT_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::HINT_AMBIENT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } - static bool LUA_NATIVE_AUDIO_HINT_SCRIPT_AUDIO_BANK(const char* audioBank, bool p1, Any p2) + static bool LUA_NATIVE_AUDIO_HINT_SCRIPT_AUDIO_BANK(sol::stack_object audioBank, bool p1, Any p2) { - auto retval = (bool)AUDIO::HINT_SCRIPT_AUDIO_BANK(audioBank, p1, p2); + auto retval = (bool)AUDIO::HINT_SCRIPT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr, p1, p2); return retval; } @@ -221,9 +227,9 @@ namespace lua::native AUDIO::RELEASE_AMBIENT_AUDIO_BANK(); } - static void LUA_NATIVE_AUDIO_RELEASE_NAMED_SCRIPT_AUDIO_BANK(const char* audioBank) + static void LUA_NATIVE_AUDIO_RELEASE_NAMED_SCRIPT_AUDIO_BANK(sol::stack_object audioBank) { - AUDIO::RELEASE_NAMED_SCRIPT_AUDIO_BANK(audioBank); + AUDIO::RELEASE_NAMED_SCRIPT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr); } static void LUA_NATIVE_AUDIO_RELEASE_SCRIPT_AUDIO_BANK() @@ -241,9 +247,9 @@ namespace lua::native AUDIO::UNHINT_SCRIPT_AUDIO_BANK(); } - static void LUA_NATIVE_AUDIO_UNHINT_NAMED_SCRIPT_AUDIO_BANK(const char* audioBank) + static void LUA_NATIVE_AUDIO_UNHINT_NAMED_SCRIPT_AUDIO_BANK(sol::stack_object audioBank) { - AUDIO::UNHINT_NAMED_SCRIPT_AUDIO_BANK(audioBank); + AUDIO::UNHINT_NAMED_SCRIPT_AUDIO_BANK(audioBank.is() ? audioBank.as() : nullptr); } static int LUA_NATIVE_AUDIO_GET_SOUND_ID() @@ -257,24 +263,24 @@ namespace lua::native AUDIO::RELEASE_SOUND_ID(soundId); } - static void LUA_NATIVE_AUDIO_PLAY_SOUND(int soundId, const char* audioName, const char* audioRef, bool p3, Any p4, bool p5) + static void LUA_NATIVE_AUDIO_PLAY_SOUND(int soundId, sol::stack_object audioName, sol::stack_object audioRef, bool p3, Any p4, bool p5) { - AUDIO::PLAY_SOUND(soundId, audioName, audioRef, p3, p4, p5); + AUDIO::PLAY_SOUND(soundId, audioName.is() ? audioName.as() : nullptr, audioRef.is() ? audioRef.as() : nullptr, p3, p4, p5); } - static void LUA_NATIVE_AUDIO_PLAY_SOUND_FRONTEND(int soundId, const char* audioName, const char* audioRef, bool p3) + static void LUA_NATIVE_AUDIO_PLAY_SOUND_FRONTEND(int soundId, sol::stack_object audioName, sol::stack_object audioRef, bool p3) { - AUDIO::PLAY_SOUND_FRONTEND(soundId, audioName, audioRef, p3); + AUDIO::PLAY_SOUND_FRONTEND(soundId, audioName.is() ? audioName.as() : nullptr, audioRef.is() ? audioRef.as() : nullptr, p3); } - static void LUA_NATIVE_AUDIO_PLAY_DEFERRED_SOUND_FRONTEND(const char* soundName, const char* soundsetName) + static void LUA_NATIVE_AUDIO_PLAY_DEFERRED_SOUND_FRONTEND(sol::stack_object soundName, sol::stack_object soundsetName) { - AUDIO::PLAY_DEFERRED_SOUND_FRONTEND(soundName, soundsetName); + AUDIO::PLAY_DEFERRED_SOUND_FRONTEND(soundName.is() ? soundName.as() : nullptr, soundsetName.is() ? soundsetName.as() : nullptr); } - static void LUA_NATIVE_AUDIO_PLAY_SOUND_FROM_ENTITY(int soundId, const char* audioName, Entity entity, const char* audioRef, bool isNetwork, Any p5) + static void LUA_NATIVE_AUDIO_PLAY_SOUND_FROM_ENTITY(int soundId, sol::stack_object audioName, Entity entity, sol::stack_object audioRef, bool isNetwork, Any p5) { - AUDIO::PLAY_SOUND_FROM_ENTITY(soundId, audioName, entity, audioRef, isNetwork, p5); + AUDIO::PLAY_SOUND_FROM_ENTITY(soundId, audioName.is() ? audioName.as() : nullptr, entity, audioRef.is() ? audioRef.as() : nullptr, isNetwork, p5); } static void LUA_NATIVE_AUDIO_PLAY_SOUND_FROM_ENTITY_HASH(int soundId, Hash model, Entity entity, Hash soundSetHash, Any p4, Any p5) @@ -282,9 +288,9 @@ namespace lua::native AUDIO::PLAY_SOUND_FROM_ENTITY_HASH(soundId, model, entity, soundSetHash, p4, p5); } - static void LUA_NATIVE_AUDIO_PLAY_SOUND_FROM_COORD(int soundId, const char* audioName, float x, float y, float z, const char* audioRef, bool isNetwork, int range, bool p8) + static void LUA_NATIVE_AUDIO_PLAY_SOUND_FROM_COORD(int soundId, sol::stack_object audioName, float x, float y, float z, sol::stack_object audioRef, bool isNetwork, int range, bool p8) { - AUDIO::PLAY_SOUND_FROM_COORD(soundId, audioName, x, y, z, audioRef, isNetwork, range, p8); + AUDIO::PLAY_SOUND_FROM_COORD(soundId, audioName.is() ? audioName.as() : nullptr, x, y, z, audioRef.is() ? audioRef.as() : nullptr, isNetwork, range, p8); } static void LUA_NATIVE_AUDIO_UPDATE_SOUND_COORD(int soundId, float x, float y, float z) @@ -309,24 +315,24 @@ namespace lua::native return retval; } - static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_SOUND(int soundId, const char* variable, float p2) + static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_SOUND(int soundId, sol::stack_object variable, float p2) { - AUDIO::SET_VARIABLE_ON_SOUND(soundId, variable, p2); + AUDIO::SET_VARIABLE_ON_SOUND(soundId, variable.is() ? variable.as() : nullptr, p2); } - static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_STREAM(const char* variable, float p1) + static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_STREAM(sol::stack_object variable, float p1) { - AUDIO::SET_VARIABLE_ON_STREAM(variable, p1); + AUDIO::SET_VARIABLE_ON_STREAM(variable.is() ? variable.as() : nullptr, p1); } - static void LUA_NATIVE_AUDIO_OVERRIDE_UNDERWATER_STREAM(const char* p0, bool p1) + static void LUA_NATIVE_AUDIO_OVERRIDE_UNDERWATER_STREAM(sol::stack_object p0, bool p1) { - AUDIO::OVERRIDE_UNDERWATER_STREAM(p0, p1); + AUDIO::OVERRIDE_UNDERWATER_STREAM(p0.is() ? p0.as() : nullptr, p1); } - static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_UNDER_WATER_STREAM(const char* variableName, float value) + static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_UNDER_WATER_STREAM(sol::stack_object variableName, float value) { - AUDIO::SET_VARIABLE_ON_UNDER_WATER_STREAM(variableName, value); + AUDIO::SET_VARIABLE_ON_UNDER_WATER_STREAM(variableName.is() ? variableName.as() : nullptr, value); } static bool LUA_NATIVE_AUDIO_HAS_SOUND_FINISHED(int soundId) @@ -335,29 +341,29 @@ namespace lua::native return retval; } - static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_NATIVE(Ped ped, const char* speechName, const char* speechParam, Any p3) + static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_NATIVE(Ped ped, sol::stack_object speechName, sol::stack_object speechParam, Any p3) { - AUDIO::PLAY_PED_AMBIENT_SPEECH_NATIVE(ped, speechName, speechParam, p3); + AUDIO::PLAY_PED_AMBIENT_SPEECH_NATIVE(ped, speechName.is() ? speechName.as() : nullptr, speechParam.is() ? speechParam.as() : nullptr, p3); } - static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_AND_CLONE_NATIVE(Ped ped, const char* speechName, const char* speechParam, Any p3) + static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_AND_CLONE_NATIVE(Ped ped, sol::stack_object speechName, sol::stack_object speechParam, Any p3) { - AUDIO::PLAY_PED_AMBIENT_SPEECH_AND_CLONE_NATIVE(ped, speechName, speechParam, p3); + AUDIO::PLAY_PED_AMBIENT_SPEECH_AND_CLONE_NATIVE(ped, speechName.is() ? speechName.as() : nullptr, speechParam.is() ? speechParam.as() : nullptr, p3); } - static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_WITH_VOICE_NATIVE(Ped ped, const char* speechName, const char* voiceName, const char* speechParam, bool p4) + static void LUA_NATIVE_AUDIO_PLAY_PED_AMBIENT_SPEECH_WITH_VOICE_NATIVE(Ped ped, sol::stack_object speechName, sol::stack_object voiceName, sol::stack_object speechParam, bool p4) { - AUDIO::PLAY_PED_AMBIENT_SPEECH_WITH_VOICE_NATIVE(ped, speechName, voiceName, speechParam, p4); + AUDIO::PLAY_PED_AMBIENT_SPEECH_WITH_VOICE_NATIVE(ped, speechName.is() ? speechName.as() : nullptr, voiceName.is() ? voiceName.as() : nullptr, speechParam.is() ? speechParam.as() : nullptr, p4); } - static void LUA_NATIVE_AUDIO_PLAY_AMBIENT_SPEECH_FROM_POSITION_NATIVE(const char* speechName, const char* voiceName, float x, float y, float z, const char* speechParam) + static void LUA_NATIVE_AUDIO_PLAY_AMBIENT_SPEECH_FROM_POSITION_NATIVE(sol::stack_object speechName, sol::stack_object voiceName, float x, float y, float z, sol::stack_object speechParam) { - AUDIO::PLAY_AMBIENT_SPEECH_FROM_POSITION_NATIVE(speechName, voiceName, x, y, z, speechParam); + AUDIO::PLAY_AMBIENT_SPEECH_FROM_POSITION_NATIVE(speechName.is() ? speechName.as() : nullptr, voiceName.is() ? voiceName.as() : nullptr, x, y, z, speechParam.is() ? speechParam.as() : nullptr); } - static void LUA_NATIVE_AUDIO_OVERRIDE_TREVOR_RAGE(const char* voiceEffect) + static void LUA_NATIVE_AUDIO_OVERRIDE_TREVOR_RAGE(sol::stack_object voiceEffect) { - AUDIO::OVERRIDE_TREVOR_RAGE(voiceEffect); + AUDIO::OVERRIDE_TREVOR_RAGE(voiceEffect.is() ? voiceEffect.as() : nullptr); } static void LUA_NATIVE_AUDIO_RESET_TREVOR_RAGE() @@ -380,19 +386,19 @@ namespace lua::native AUDIO::RELEASE_WEAPON_AUDIO(); } - static void LUA_NATIVE_AUDIO_ACTIVATE_AUDIO_SLOWMO_MODE(const char* mode) + static void LUA_NATIVE_AUDIO_ACTIVATE_AUDIO_SLOWMO_MODE(sol::stack_object mode) { - AUDIO::ACTIVATE_AUDIO_SLOWMO_MODE(mode); + AUDIO::ACTIVATE_AUDIO_SLOWMO_MODE(mode.is() ? mode.as() : nullptr); } - static void LUA_NATIVE_AUDIO_DEACTIVATE_AUDIO_SLOWMO_MODE(const char* mode) + static void LUA_NATIVE_AUDIO_DEACTIVATE_AUDIO_SLOWMO_MODE(sol::stack_object mode) { - AUDIO::DEACTIVATE_AUDIO_SLOWMO_MODE(mode); + AUDIO::DEACTIVATE_AUDIO_SLOWMO_MODE(mode.is() ? mode.as() : nullptr); } - static void LUA_NATIVE_AUDIO_SET_AMBIENT_VOICE_NAME(Ped ped, const char* name) + static void LUA_NATIVE_AUDIO_SET_AMBIENT_VOICE_NAME(Ped ped, sol::stack_object name) { - AUDIO::SET_AMBIENT_VOICE_NAME(ped, name); + AUDIO::SET_AMBIENT_VOICE_NAME(ped, name.is() ? name.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_AMBIENT_VOICE_NAME_HASH(Ped ped, Hash hash) @@ -465,9 +471,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_AUDIO_DOES_CONTEXT_EXIST_FOR_THIS_PED(Ped ped, const char* speechName, bool p2) + static bool LUA_NATIVE_AUDIO_DOES_CONTEXT_EXIST_FOR_THIS_PED(Ped ped, sol::stack_object speechName, bool p2) { - auto retval = (bool)AUDIO::DOES_CONTEXT_EXIST_FOR_THIS_PED(ped, speechName, p2); + auto retval = (bool)AUDIO::DOES_CONTEXT_EXIST_FOR_THIS_PED(ped, speechName.is() ? speechName.as() : nullptr, p2); return retval; } @@ -482,9 +488,9 @@ namespace lua::native AUDIO::SET_PED_IS_DRUNK(ped, toggle); } - static void LUA_NATIVE_AUDIO_PLAY_ANIMAL_VOCALIZATION(Ped pedHandle, int p1, const char* speechName) + static void LUA_NATIVE_AUDIO_PLAY_ANIMAL_VOCALIZATION(Ped pedHandle, int p1, sol::stack_object speechName) { - AUDIO::PLAY_ANIMAL_VOCALIZATION(pedHandle, p1, speechName); + AUDIO::PLAY_ANIMAL_VOCALIZATION(pedHandle, p1, speechName.is() ? speechName.as() : nullptr); } static bool LUA_NATIVE_AUDIO_IS_ANIMAL_VOCALIZATION_PLAYING(Ped pedHandle) @@ -555,14 +561,14 @@ namespace lua::native AUDIO::SET_RADIO_RETUNE_DOWN(); } - static void LUA_NATIVE_AUDIO_SET_RADIO_TO_STATION_NAME(const char* stationName) + static void LUA_NATIVE_AUDIO_SET_RADIO_TO_STATION_NAME(sol::stack_object stationName) { - AUDIO::SET_RADIO_TO_STATION_NAME(stationName); + AUDIO::SET_RADIO_TO_STATION_NAME(stationName.is() ? stationName.as() : nullptr); } - static void LUA_NATIVE_AUDIO_SET_VEH_RADIO_STATION(Vehicle vehicle, const char* radioStation) + static void LUA_NATIVE_AUDIO_SET_VEH_RADIO_STATION(Vehicle vehicle, sol::stack_object radioStation) { - AUDIO::SET_VEH_RADIO_STATION(vehicle, radioStation); + AUDIO::SET_VEH_RADIO_STATION(vehicle, radioStation.is() ? radioStation.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_VEH_HAS_NORMAL_RADIO(Vehicle vehicle) @@ -581,19 +587,19 @@ namespace lua::native AUDIO::SET_VEH_FORCED_RADIO_THIS_FRAME(vehicle); } - static void LUA_NATIVE_AUDIO_SET_EMITTER_RADIO_STATION(const char* emitterName, const char* radioStation, Any p2) + static void LUA_NATIVE_AUDIO_SET_EMITTER_RADIO_STATION(sol::stack_object emitterName, sol::stack_object radioStation, Any p2) { - AUDIO::SET_EMITTER_RADIO_STATION(emitterName, radioStation, p2); + AUDIO::SET_EMITTER_RADIO_STATION(emitterName.is() ? emitterName.as() : nullptr, radioStation.is() ? radioStation.as() : nullptr, p2); } - static void LUA_NATIVE_AUDIO_SET_STATIC_EMITTER_ENABLED(const char* emitterName, bool toggle) + static void LUA_NATIVE_AUDIO_SET_STATIC_EMITTER_ENABLED(sol::stack_object emitterName, bool toggle) { - AUDIO::SET_STATIC_EMITTER_ENABLED(emitterName, toggle); + AUDIO::SET_STATIC_EMITTER_ENABLED(emitterName.is() ? emitterName.as() : nullptr, toggle); } - static void LUA_NATIVE_AUDIO_LINK_STATIC_EMITTER_TO_ENTITY(const char* emitterName, Entity entity) + static void LUA_NATIVE_AUDIO_LINK_STATIC_EMITTER_TO_ENTITY(sol::stack_object emitterName, Entity entity) { - AUDIO::LINK_STATIC_EMITTER_TO_ENTITY(emitterName, entity); + AUDIO::LINK_STATIC_EMITTER_TO_ENTITY(emitterName.is() ? emitterName.as() : nullptr, entity); } static void LUA_NATIVE_AUDIO_SET_RADIO_TO_STATION_INDEX(int radioStation) @@ -633,14 +639,14 @@ namespace lua::native AUDIO::SKIP_RADIO_FORWARD(); } - static void LUA_NATIVE_AUDIO_FREEZE_RADIO_STATION(const char* radioStation) + static void LUA_NATIVE_AUDIO_FREEZE_RADIO_STATION(sol::stack_object radioStation) { - AUDIO::FREEZE_RADIO_STATION(radioStation); + AUDIO::FREEZE_RADIO_STATION(radioStation.is() ? radioStation.as() : nullptr); } - static void LUA_NATIVE_AUDIO_UNFREEZE_RADIO_STATION(const char* radioStation) + static void LUA_NATIVE_AUDIO_UNFREEZE_RADIO_STATION(sol::stack_object radioStation) { - AUDIO::UNFREEZE_RADIO_STATION(radioStation); + AUDIO::UNFREEZE_RADIO_STATION(radioStation.is() ? radioStation.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_RADIO_AUTO_UNFREEZE(bool toggle) @@ -648,9 +654,9 @@ namespace lua::native AUDIO::SET_RADIO_AUTO_UNFREEZE(toggle); } - static void LUA_NATIVE_AUDIO_SET_INITIAL_PLAYER_STATION(const char* radioStation) + static void LUA_NATIVE_AUDIO_SET_INITIAL_PLAYER_STATION(sol::stack_object radioStation) { - AUDIO::SET_INITIAL_PLAYER_STATION(radioStation); + AUDIO::SET_INITIAL_PLAYER_STATION(radioStation.is() ? radioStation.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_USER_RADIO_CONTROL_ENABLED(bool toggle) @@ -658,19 +664,19 @@ namespace lua::native AUDIO::SET_USER_RADIO_CONTROL_ENABLED(toggle); } - static void LUA_NATIVE_AUDIO_SET_RADIO_TRACK(const char* radioStation, const char* radioTrack) + static void LUA_NATIVE_AUDIO_SET_RADIO_TRACK(sol::stack_object radioStation, sol::stack_object radioTrack) { - AUDIO::SET_RADIO_TRACK(radioStation, radioTrack); + AUDIO::SET_RADIO_TRACK(radioStation.is() ? radioStation.as() : nullptr, radioTrack.is() ? radioTrack.as() : nullptr); } - static void LUA_NATIVE_AUDIO_SET_RADIO_TRACK_WITH_START_OFFSET(const char* radioStationName, const char* mixName, int p2) + static void LUA_NATIVE_AUDIO_SET_RADIO_TRACK_WITH_START_OFFSET(sol::stack_object radioStationName, sol::stack_object mixName, int p2) { - AUDIO::SET_RADIO_TRACK_WITH_START_OFFSET(radioStationName, mixName, p2); + AUDIO::SET_RADIO_TRACK_WITH_START_OFFSET(radioStationName.is() ? radioStationName.as() : nullptr, mixName.is() ? mixName.as() : nullptr, p2); } - static void LUA_NATIVE_AUDIO_SET_NEXT_RADIO_TRACK(const char* radioName, const char* radioTrack, const char* p2, const char* p3) + static void LUA_NATIVE_AUDIO_SET_NEXT_RADIO_TRACK(sol::stack_object radioName, sol::stack_object radioTrack, sol::stack_object p2, sol::stack_object p3) { - AUDIO::SET_NEXT_RADIO_TRACK(radioName, radioTrack, p2, p3); + AUDIO::SET_NEXT_RADIO_TRACK(radioName.is() ? radioName.as() : nullptr, radioTrack.is() ? radioTrack.as() : nullptr, p2.is() ? p2.as() : nullptr, p3.is() ? p3.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_VEHICLE_RADIO_LOUD(Vehicle vehicle, bool toggle) @@ -711,14 +717,14 @@ namespace lua::native AUDIO::SET_POSITIONED_PLAYER_VEHICLE_RADIO_EMITTER_ENABLED(p0); } - static void LUA_NATIVE_AUDIO_SET_CUSTOM_RADIO_TRACK_LIST(const char* radioStation, const char* trackListName, bool p2) + static void LUA_NATIVE_AUDIO_SET_CUSTOM_RADIO_TRACK_LIST(sol::stack_object radioStation, sol::stack_object trackListName, bool p2) { - AUDIO::SET_CUSTOM_RADIO_TRACK_LIST(radioStation, trackListName, p2); + AUDIO::SET_CUSTOM_RADIO_TRACK_LIST(radioStation.is() ? radioStation.as() : nullptr, trackListName.is() ? trackListName.as() : nullptr, p2); } - static void LUA_NATIVE_AUDIO_CLEAR_CUSTOM_RADIO_TRACK_LIST(const char* radioStation) + static void LUA_NATIVE_AUDIO_CLEAR_CUSTOM_RADIO_TRACK_LIST(sol::stack_object radioStation) { - AUDIO::CLEAR_CUSTOM_RADIO_TRACK_LIST(radioStation); + AUDIO::CLEAR_CUSTOM_RADIO_TRACK_LIST(radioStation.is() ? radioStation.as() : nullptr); } static int LUA_NATIVE_AUDIO_GET_NUM_UNLOCKED_RADIO_STATIONS() @@ -733,9 +739,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_AUDIO_SET_RADIO_STATION_MUSIC_ONLY(const char* radioStation, bool toggle) + static void LUA_NATIVE_AUDIO_SET_RADIO_STATION_MUSIC_ONLY(sol::stack_object radioStation, bool toggle) { - AUDIO::SET_RADIO_STATION_MUSIC_ONLY(radioStation, toggle); + AUDIO::SET_RADIO_STATION_MUSIC_ONLY(radioStation.is() ? radioStation.as() : nullptr, toggle); } static void LUA_NATIVE_AUDIO_SET_RADIO_FRONTEND_FADE_TIME(float fadeTime) @@ -743,14 +749,14 @@ namespace lua::native AUDIO::SET_RADIO_FRONTEND_FADE_TIME(fadeTime); } - static void LUA_NATIVE_AUDIO_UNLOCK_RADIO_STATION_TRACK_LIST(const char* radioStation, const char* trackListName) + static void LUA_NATIVE_AUDIO_UNLOCK_RADIO_STATION_TRACK_LIST(sol::stack_object radioStation, sol::stack_object trackListName) { - AUDIO::UNLOCK_RADIO_STATION_TRACK_LIST(radioStation, trackListName); + AUDIO::UNLOCK_RADIO_STATION_TRACK_LIST(radioStation.is() ? radioStation.as() : nullptr, trackListName.is() ? trackListName.as() : nullptr); } - static void LUA_NATIVE_AUDIO_LOCK_RADIO_STATION_TRACK_LIST(const char* radioStation, const char* trackListName) + static void LUA_NATIVE_AUDIO_LOCK_RADIO_STATION_TRACK_LIST(sol::stack_object radioStation, sol::stack_object trackListName) { - AUDIO::LOCK_RADIO_STATION_TRACK_LIST(radioStation, trackListName); + AUDIO::LOCK_RADIO_STATION_TRACK_LIST(radioStation.is() ? radioStation.as() : nullptr, trackListName.is() ? trackListName.as() : nullptr); } static void LUA_NATIVE_AUDIO_UPDATE_UNLOCKABLE_DJ_RADIO_TRACKS(bool enableMixes) @@ -758,19 +764,19 @@ namespace lua::native AUDIO::UPDATE_UNLOCKABLE_DJ_RADIO_TRACKS(enableMixes); } - static void LUA_NATIVE_AUDIO_LOCK_RADIO_STATION(const char* radioStationName, bool toggle) + static void LUA_NATIVE_AUDIO_LOCK_RADIO_STATION(sol::stack_object radioStationName, bool toggle) { - AUDIO::LOCK_RADIO_STATION(radioStationName, toggle); + AUDIO::LOCK_RADIO_STATION(radioStationName.is() ? radioStationName.as() : nullptr, toggle); } - static void LUA_NATIVE_AUDIO_SET_RADIO_STATION_AS_FAVOURITE(const char* radioStation, bool toggle) + static void LUA_NATIVE_AUDIO_SET_RADIO_STATION_AS_FAVOURITE(sol::stack_object radioStation, bool toggle) { - AUDIO::SET_RADIO_STATION_AS_FAVOURITE(radioStation, toggle); + AUDIO::SET_RADIO_STATION_AS_FAVOURITE(radioStation.is() ? radioStation.as() : nullptr, toggle); } - static bool LUA_NATIVE_AUDIO_IS_RADIO_STATION_FAVOURITED(const char* radioStation) + static bool LUA_NATIVE_AUDIO_IS_RADIO_STATION_FAVOURITED(sol::stack_object radioStation) { - auto retval = (bool)AUDIO::IS_RADIO_STATION_FAVOURITED(radioStation); + auto retval = (bool)AUDIO::IS_RADIO_STATION_FAVOURITED(radioStation.is() ? radioStation.as() : nullptr); return retval; } @@ -785,20 +791,20 @@ namespace lua::native return return_values; } - static void LUA_NATIVE_AUDIO_FORCE_MUSIC_TRACK_LIST(const char* radioStation, const char* trackListName, int milliseconds) + static void LUA_NATIVE_AUDIO_FORCE_MUSIC_TRACK_LIST(sol::stack_object radioStation, sol::stack_object trackListName, int milliseconds) { - AUDIO::FORCE_MUSIC_TRACK_LIST(radioStation, trackListName, milliseconds); + AUDIO::FORCE_MUSIC_TRACK_LIST(radioStation.is() ? radioStation.as() : nullptr, trackListName.is() ? trackListName.as() : nullptr, milliseconds); } - static int LUA_NATIVE_AUDIO_GET_CURRENT_TRACK_PLAY_TIME(const char* radioStationName) + static int LUA_NATIVE_AUDIO_GET_CURRENT_TRACK_PLAY_TIME(sol::stack_object radioStationName) { - auto retval = AUDIO::GET_CURRENT_TRACK_PLAY_TIME(radioStationName); + auto retval = AUDIO::GET_CURRENT_TRACK_PLAY_TIME(radioStationName.is() ? radioStationName.as() : nullptr); return retval; } - static Hash LUA_NATIVE_AUDIO_GET_CURRENT_TRACK_SOUND_NAME(const char* radioStationName) + static Hash LUA_NATIVE_AUDIO_GET_CURRENT_TRACK_SOUND_NAME(sol::stack_object radioStationName) { - auto retval = AUDIO::GET_CURRENT_TRACK_SOUND_NAME(radioStationName); + auto retval = AUDIO::GET_CURRENT_TRACK_SOUND_NAME(radioStationName.is() ? radioStationName.as() : nullptr); return retval; } @@ -807,39 +813,39 @@ namespace lua::native AUDIO::SET_VEHICLE_MISSILE_WARNING_ENABLED(vehicle, toggle); } - static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_STATE(const char* zoneName, bool p1, bool p2) + static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_STATE(sol::stack_object zoneName, bool p1, bool p2) { - AUDIO::SET_AMBIENT_ZONE_STATE(zoneName, p1, p2); + AUDIO::SET_AMBIENT_ZONE_STATE(zoneName.is() ? zoneName.as() : nullptr, p1, p2); } - static void LUA_NATIVE_AUDIO_CLEAR_AMBIENT_ZONE_STATE(const char* zoneName, bool p1) + static void LUA_NATIVE_AUDIO_CLEAR_AMBIENT_ZONE_STATE(sol::stack_object zoneName, bool p1) { - AUDIO::CLEAR_AMBIENT_ZONE_STATE(zoneName, p1); + AUDIO::CLEAR_AMBIENT_ZONE_STATE(zoneName.is() ? zoneName.as() : nullptr, p1); } - static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_LIST_STATE(const char* ambientZone, bool p1, bool p2) + static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_LIST_STATE(sol::stack_object ambientZone, bool p1, bool p2) { - AUDIO::SET_AMBIENT_ZONE_LIST_STATE(ambientZone, p1, p2); + AUDIO::SET_AMBIENT_ZONE_LIST_STATE(ambientZone.is() ? ambientZone.as() : nullptr, p1, p2); } - static void LUA_NATIVE_AUDIO_CLEAR_AMBIENT_ZONE_LIST_STATE(const char* ambientZone, bool p1) + static void LUA_NATIVE_AUDIO_CLEAR_AMBIENT_ZONE_LIST_STATE(sol::stack_object ambientZone, bool p1) { - AUDIO::CLEAR_AMBIENT_ZONE_LIST_STATE(ambientZone, p1); + AUDIO::CLEAR_AMBIENT_ZONE_LIST_STATE(ambientZone.is() ? ambientZone.as() : nullptr, p1); } - static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_STATE_PERSISTENT(const char* ambientZone, bool p1, bool p2) + static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_STATE_PERSISTENT(sol::stack_object ambientZone, bool p1, bool p2) { - AUDIO::SET_AMBIENT_ZONE_STATE_PERSISTENT(ambientZone, p1, p2); + AUDIO::SET_AMBIENT_ZONE_STATE_PERSISTENT(ambientZone.is() ? ambientZone.as() : nullptr, p1, p2); } - static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_LIST_STATE_PERSISTENT(const char* ambientZone, bool p1, bool p2) + static void LUA_NATIVE_AUDIO_SET_AMBIENT_ZONE_LIST_STATE_PERSISTENT(sol::stack_object ambientZone, bool p1, bool p2) { - AUDIO::SET_AMBIENT_ZONE_LIST_STATE_PERSISTENT(ambientZone, p1, p2); + AUDIO::SET_AMBIENT_ZONE_LIST_STATE_PERSISTENT(ambientZone.is() ? ambientZone.as() : nullptr, p1, p2); } - static bool LUA_NATIVE_AUDIO_IS_AMBIENT_ZONE_ENABLED(const char* ambientZone) + static bool LUA_NATIVE_AUDIO_IS_AMBIENT_ZONE_ENABLED(sol::stack_object ambientZone) { - auto retval = (bool)AUDIO::IS_AMBIENT_ZONE_ENABLED(ambientZone); + auto retval = (bool)AUDIO::IS_AMBIENT_ZONE_ENABLED(ambientZone.is() ? ambientZone.as() : nullptr); return retval; } @@ -848,19 +854,19 @@ namespace lua::native AUDIO::REFRESH_CLOSEST_OCEAN_SHORELINE(); } - static void LUA_NATIVE_AUDIO_SET_CUTSCENE_AUDIO_OVERRIDE(const char* name) + static void LUA_NATIVE_AUDIO_SET_CUTSCENE_AUDIO_OVERRIDE(sol::stack_object name) { - AUDIO::SET_CUTSCENE_AUDIO_OVERRIDE(name); + AUDIO::SET_CUTSCENE_AUDIO_OVERRIDE(name.is() ? name.as() : nullptr); } - static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_SYNCH_SCENE_AUDIO(const char* variableName, float value) + static void LUA_NATIVE_AUDIO_SET_VARIABLE_ON_SYNCH_SCENE_AUDIO(sol::stack_object variableName, float value) { - AUDIO::SET_VARIABLE_ON_SYNCH_SCENE_AUDIO(variableName, value); + AUDIO::SET_VARIABLE_ON_SYNCH_SCENE_AUDIO(variableName.is() ? variableName.as() : nullptr, value); } - static int LUA_NATIVE_AUDIO_PLAY_POLICE_REPORT(const char* name, float p1) + static int LUA_NATIVE_AUDIO_PLAY_POLICE_REPORT(sol::stack_object name, float p1) { - auto retval = AUDIO::PLAY_POLICE_REPORT(name, p1); + auto retval = AUDIO::PLAY_POLICE_REPORT(name.is() ? name.as() : nullptr, p1); return retval; } @@ -917,15 +923,15 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_AUDIO_LOAD_STREAM(const char* streamName, const char* soundSet) + static bool LUA_NATIVE_AUDIO_LOAD_STREAM(sol::stack_object streamName, sol::stack_object soundSet) { - auto retval = (bool)AUDIO::LOAD_STREAM(streamName, soundSet); + auto retval = (bool)AUDIO::LOAD_STREAM(streamName.is() ? streamName.as() : nullptr, soundSet.is() ? soundSet.as() : nullptr); return retval; } - static bool LUA_NATIVE_AUDIO_LOAD_STREAM_WITH_START_OFFSET(const char* streamName, int startOffset, const char* soundSet) + static bool LUA_NATIVE_AUDIO_LOAD_STREAM_WITH_START_OFFSET(sol::stack_object streamName, int startOffset, sol::stack_object soundSet) { - auto retval = (bool)AUDIO::LOAD_STREAM_WITH_START_OFFSET(streamName, startOffset, soundSet); + auto retval = (bool)AUDIO::LOAD_STREAM_WITH_START_OFFSET(streamName.is() ? streamName.as() : nullptr, startOffset, soundSet.is() ? soundSet.as() : nullptr); return retval; } @@ -985,14 +991,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_AUDIO_BLOCK_SPEECH_CONTEXT_GROUP(const char* p0, int p1) + static void LUA_NATIVE_AUDIO_BLOCK_SPEECH_CONTEXT_GROUP(sol::stack_object p0, int p1) { - AUDIO::BLOCK_SPEECH_CONTEXT_GROUP(p0, p1); + AUDIO::BLOCK_SPEECH_CONTEXT_GROUP(p0.is() ? p0.as() : nullptr, p1); } - static void LUA_NATIVE_AUDIO_UNBLOCK_SPEECH_CONTEXT_GROUP(const char* p0) + static void LUA_NATIVE_AUDIO_UNBLOCK_SPEECH_CONTEXT_GROUP(sol::stack_object p0) { - AUDIO::UNBLOCK_SPEECH_CONTEXT_GROUP(p0); + AUDIO::UNBLOCK_SPEECH_CONTEXT_GROUP(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_AUDIO_SET_SIREN_WITH_NO_DRIVER(Vehicle vehicle, bool toggle) @@ -1035,9 +1041,9 @@ namespace lua::native AUDIO::USE_SIREN_AS_HORN(vehicle, toggle); } - static void LUA_NATIVE_AUDIO_FORCE_USE_AUDIO_GAME_OBJECT(Vehicle vehicle, const char* audioName) + static void LUA_NATIVE_AUDIO_FORCE_USE_AUDIO_GAME_OBJECT(Vehicle vehicle, sol::stack_object audioName) { - AUDIO::FORCE_USE_AUDIO_GAME_OBJECT(vehicle, audioName); + AUDIO::FORCE_USE_AUDIO_GAME_OBJECT(vehicle, audioName.is() ? audioName.as() : nullptr); } static void LUA_NATIVE_AUDIO_PRELOAD_VEHICLE_AUDIO_BANK(Hash vehicleModel) @@ -1045,9 +1051,9 @@ namespace lua::native AUDIO::PRELOAD_VEHICLE_AUDIO_BANK(vehicleModel); } - static void LUA_NATIVE_AUDIO_SET_VEHICLE_STARTUP_REV_SOUND(Vehicle vehicle, const char* p1, const char* p2) + static void LUA_NATIVE_AUDIO_SET_VEHICLE_STARTUP_REV_SOUND(Vehicle vehicle, sol::stack_object p1, sol::stack_object p2) { - AUDIO::SET_VEHICLE_STARTUP_REV_SOUND(vehicle, p1, p2); + AUDIO::SET_VEHICLE_STARTUP_REV_SOUND(vehicle, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr); } static void LUA_NATIVE_AUDIO_RESET_VEHICLE_STARTUP_REV_SOUND(Vehicle vehicle) @@ -1116,6 +1122,11 @@ namespace lua::native AUDIO::ENABLE_STALL_WARNING_SOUNDS(vehicle, toggle); } + static void LUA_NATIVE_AUDIO_ENABLE_DRAG_RACE_STATIONARY_WARNING_SOUNDS_(Vehicle vehicle, bool enable) + { + AUDIO::_ENABLE_DRAG_RACE_STATIONARY_WARNING_SOUNDS(vehicle, enable); + } + static bool LUA_NATIVE_AUDIO_IS_GAME_IN_CONTROL_OF_MUSIC() { auto retval = (bool)AUDIO::IS_GAME_IN_CONTROL_OF_MUSIC(); @@ -1127,9 +1138,9 @@ namespace lua::native AUDIO::SET_GPS_ACTIVE(active); } - static void LUA_NATIVE_AUDIO_PLAY_MISSION_COMPLETE_AUDIO(const char* audioName) + static void LUA_NATIVE_AUDIO_PLAY_MISSION_COMPLETE_AUDIO(sol::stack_object audioName) { - AUDIO::PLAY_MISSION_COMPLETE_AUDIO(audioName); + AUDIO::PLAY_MISSION_COMPLETE_AUDIO(audioName.is() ? audioName.as() : nullptr); } static bool LUA_NATIVE_AUDIO_IS_MISSION_COMPLETE_PLAYING() @@ -1149,15 +1160,15 @@ namespace lua::native AUDIO::BLOCK_DEATH_JINGLE(toggle); } - static bool LUA_NATIVE_AUDIO_START_AUDIO_SCENE(const char* scene) + static bool LUA_NATIVE_AUDIO_START_AUDIO_SCENE(sol::stack_object scene) { - auto retval = (bool)AUDIO::START_AUDIO_SCENE(scene); + auto retval = (bool)AUDIO::START_AUDIO_SCENE(scene.is() ? scene.as() : nullptr); return retval; } - static void LUA_NATIVE_AUDIO_STOP_AUDIO_SCENE(const char* scene) + static void LUA_NATIVE_AUDIO_STOP_AUDIO_SCENE(sol::stack_object scene) { - AUDIO::STOP_AUDIO_SCENE(scene); + AUDIO::STOP_AUDIO_SCENE(scene.is() ? scene.as() : nullptr); } static void LUA_NATIVE_AUDIO_STOP_AUDIO_SCENES() @@ -1165,15 +1176,15 @@ namespace lua::native AUDIO::STOP_AUDIO_SCENES(); } - static bool LUA_NATIVE_AUDIO_IS_AUDIO_SCENE_ACTIVE(const char* scene) + static bool LUA_NATIVE_AUDIO_IS_AUDIO_SCENE_ACTIVE(sol::stack_object scene) { - auto retval = (bool)AUDIO::IS_AUDIO_SCENE_ACTIVE(scene); + auto retval = (bool)AUDIO::IS_AUDIO_SCENE_ACTIVE(scene.is() ? scene.as() : nullptr); return retval; } - static void LUA_NATIVE_AUDIO_SET_AUDIO_SCENE_VARIABLE(const char* scene, const char* variable, float value) + static void LUA_NATIVE_AUDIO_SET_AUDIO_SCENE_VARIABLE(sol::stack_object scene, sol::stack_object variable, float value) { - AUDIO::SET_AUDIO_SCENE_VARIABLE(scene, variable, value); + AUDIO::SET_AUDIO_SCENE_VARIABLE(scene.is() ? scene.as() : nullptr, variable.is() ? variable.as() : nullptr, value); } static void LUA_NATIVE_AUDIO_SET_AUDIO_SCRIPT_CLEANUP_TIME(int time) @@ -1181,9 +1192,9 @@ namespace lua::native AUDIO::SET_AUDIO_SCRIPT_CLEANUP_TIME(time); } - static void LUA_NATIVE_AUDIO_ADD_ENTITY_TO_AUDIO_MIX_GROUP(Entity entity, const char* groupName, float p2) + static void LUA_NATIVE_AUDIO_ADD_ENTITY_TO_AUDIO_MIX_GROUP(Entity entity, sol::stack_object groupName, float p2) { - AUDIO::ADD_ENTITY_TO_AUDIO_MIX_GROUP(entity, groupName, p2); + AUDIO::ADD_ENTITY_TO_AUDIO_MIX_GROUP(entity, groupName.is() ? groupName.as() : nullptr, p2); } static void LUA_NATIVE_AUDIO_REMOVE_ENTITY_FROM_AUDIO_MIX_GROUP(Entity entity, float p1) @@ -1203,21 +1214,21 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_AUDIO_PREPARE_MUSIC_EVENT(const char* eventName) + static bool LUA_NATIVE_AUDIO_PREPARE_MUSIC_EVENT(sol::stack_object eventName) { - auto retval = (bool)AUDIO::PREPARE_MUSIC_EVENT(eventName); + auto retval = (bool)AUDIO::PREPARE_MUSIC_EVENT(eventName.is() ? eventName.as() : nullptr); return retval; } - static bool LUA_NATIVE_AUDIO_CANCEL_MUSIC_EVENT(const char* eventName) + static bool LUA_NATIVE_AUDIO_CANCEL_MUSIC_EVENT(sol::stack_object eventName) { - auto retval = (bool)AUDIO::CANCEL_MUSIC_EVENT(eventName); + auto retval = (bool)AUDIO::CANCEL_MUSIC_EVENT(eventName.is() ? eventName.as() : nullptr); return retval; } - static bool LUA_NATIVE_AUDIO_TRIGGER_MUSIC_EVENT(const char* eventName) + static bool LUA_NATIVE_AUDIO_TRIGGER_MUSIC_EVENT(sol::stack_object eventName) { - auto retval = (bool)AUDIO::TRIGGER_MUSIC_EVENT(eventName); + auto retval = (bool)AUDIO::TRIGGER_MUSIC_EVENT(eventName.is() ? eventName.as() : nullptr); return retval; } @@ -1268,20 +1279,20 @@ namespace lua::native AUDIO::FORCE_PED_PANIC_WALLA(); } - static bool LUA_NATIVE_AUDIO_PREPARE_ALARM(const char* alarmName) + static bool LUA_NATIVE_AUDIO_PREPARE_ALARM(sol::stack_object alarmName) { - auto retval = (bool)AUDIO::PREPARE_ALARM(alarmName); + auto retval = (bool)AUDIO::PREPARE_ALARM(alarmName.is() ? alarmName.as() : nullptr); return retval; } - static void LUA_NATIVE_AUDIO_START_ALARM(const char* alarmName, bool p2) + static void LUA_NATIVE_AUDIO_START_ALARM(sol::stack_object alarmName, bool p2) { - AUDIO::START_ALARM(alarmName, p2); + AUDIO::START_ALARM(alarmName.is() ? alarmName.as() : nullptr, p2); } - static void LUA_NATIVE_AUDIO_STOP_ALARM(const char* alarmName, bool toggle) + static void LUA_NATIVE_AUDIO_STOP_ALARM(sol::stack_object alarmName, bool toggle) { - AUDIO::STOP_ALARM(alarmName, toggle); + AUDIO::STOP_ALARM(alarmName.is() ? alarmName.as() : nullptr, toggle); } static void LUA_NATIVE_AUDIO_STOP_ALL_ALARMS(bool stop) @@ -1289,9 +1300,9 @@ namespace lua::native AUDIO::STOP_ALL_ALARMS(stop); } - static bool LUA_NATIVE_AUDIO_IS_ALARM_PLAYING(const char* alarmName) + static bool LUA_NATIVE_AUDIO_IS_ALARM_PLAYING(sol::stack_object alarmName) { - auto retval = (bool)AUDIO::IS_ALARM_PLAYING(alarmName); + auto retval = (bool)AUDIO::IS_ALARM_PLAYING(alarmName.is() ? alarmName.as() : nullptr); return retval; } @@ -1357,20 +1368,20 @@ namespace lua::native AUDIO::ENABLE_STUNT_JUMP_AUDIO(); } - static void LUA_NATIVE_AUDIO_SET_AUDIO_FLAG(const char* flagName, bool toggle) + static void LUA_NATIVE_AUDIO_SET_AUDIO_FLAG(sol::stack_object flagName, bool toggle) { - AUDIO::SET_AUDIO_FLAG(flagName, toggle); + AUDIO::SET_AUDIO_FLAG(flagName.is() ? flagName.as() : nullptr, toggle); } - static bool LUA_NATIVE_AUDIO_PREPARE_SYNCHRONIZED_AUDIO_EVENT(const char* audioEvent, Any p1) + static bool LUA_NATIVE_AUDIO_PREPARE_SYNCHRONIZED_AUDIO_EVENT(sol::stack_object audioEvent, Any p1) { - auto retval = (bool)AUDIO::PREPARE_SYNCHRONIZED_AUDIO_EVENT(audioEvent, p1); + auto retval = (bool)AUDIO::PREPARE_SYNCHRONIZED_AUDIO_EVENT(audioEvent.is() ? audioEvent.as() : nullptr, p1); return retval; } - static bool LUA_NATIVE_AUDIO_PREPARE_SYNCHRONIZED_AUDIO_EVENT_FOR_SCENE(int sceneID, const char* audioEvent) + static bool LUA_NATIVE_AUDIO_PREPARE_SYNCHRONIZED_AUDIO_EVENT_FOR_SCENE(int sceneID, sol::stack_object audioEvent) { - auto retval = (bool)AUDIO::PREPARE_SYNCHRONIZED_AUDIO_EVENT_FOR_SCENE(sceneID, audioEvent); + auto retval = (bool)AUDIO::PREPARE_SYNCHRONIZED_AUDIO_EVENT_FOR_SCENE(sceneID, audioEvent.is() ? audioEvent.as() : nullptr); return retval; } @@ -1386,14 +1397,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_AUDIO_INIT_SYNCH_SCENE_AUDIO_WITH_POSITION(const char* audioEvent, float x, float y, float z) + static void LUA_NATIVE_AUDIO_INIT_SYNCH_SCENE_AUDIO_WITH_POSITION(sol::stack_object audioEvent, float x, float y, float z) { - AUDIO::INIT_SYNCH_SCENE_AUDIO_WITH_POSITION(audioEvent, x, y, z); + AUDIO::INIT_SYNCH_SCENE_AUDIO_WITH_POSITION(audioEvent.is() ? audioEvent.as() : nullptr, x, y, z); } - static void LUA_NATIVE_AUDIO_INIT_SYNCH_SCENE_AUDIO_WITH_ENTITY(const char* audioEvent, Entity entity) + static void LUA_NATIVE_AUDIO_INIT_SYNCH_SCENE_AUDIO_WITH_ENTITY(sol::stack_object audioEvent, Entity entity) { - AUDIO::INIT_SYNCH_SCENE_AUDIO_WITH_ENTITY(audioEvent, entity); + AUDIO::INIT_SYNCH_SCENE_AUDIO_WITH_ENTITY(audioEvent.is() ? audioEvent.as() : nullptr, entity); } static void LUA_NATIVE_AUDIO_SET_AUDIO_SPECIAL_EFFECT_MODE(int mode) @@ -1401,14 +1412,14 @@ namespace lua::native AUDIO::SET_AUDIO_SPECIAL_EFFECT_MODE(mode); } - static void LUA_NATIVE_AUDIO_SET_PORTAL_SETTINGS_OVERRIDE(const char* p0, const char* p1) + static void LUA_NATIVE_AUDIO_SET_PORTAL_SETTINGS_OVERRIDE(sol::stack_object p0, sol::stack_object p1) { - AUDIO::SET_PORTAL_SETTINGS_OVERRIDE(p0, p1); + AUDIO::SET_PORTAL_SETTINGS_OVERRIDE(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_AUDIO_REMOVE_PORTAL_SETTINGS_OVERRIDE(const char* p0) + static void LUA_NATIVE_AUDIO_REMOVE_PORTAL_SETTINGS_OVERRIDE(sol::stack_object p0) { - AUDIO::REMOVE_PORTAL_SETTINGS_OVERRIDE(p0); + AUDIO::REMOVE_PORTAL_SETTINGS_OVERRIDE(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_AUDIO_STOP_SMOKE_GRENADE_EXPLOSION_SOUNDS() @@ -1473,6 +1484,7 @@ namespace lua::native AUDIO.set_function("STOP_PED_RINGTONE", LUA_NATIVE_AUDIO_STOP_PED_RINGTONE); AUDIO.set_function("IS_MOBILE_PHONE_CALL_ONGOING", LUA_NATIVE_AUDIO_IS_MOBILE_PHONE_CALL_ONGOING); AUDIO.set_function("IS_MOBILE_INTERFERENCE_ACTIVE", LUA_NATIVE_AUDIO_IS_MOBILE_INTERFERENCE_ACTIVE); + AUDIO.set_function("GET_CURRENT_TV_SHOW_PLAY_TIME", LUA_NATIVE_AUDIO_GET_CURRENT_TV_SHOW_PLAY_TIME); AUDIO.set_function("CREATE_NEW_SCRIPTED_CONVERSATION", LUA_NATIVE_AUDIO_CREATE_NEW_SCRIPTED_CONVERSATION); AUDIO.set_function("ADD_LINE_TO_CONVERSATION", LUA_NATIVE_AUDIO_ADD_LINE_TO_CONVERSATION); AUDIO.set_function("ADD_PED_TO_CONVERSATION", LUA_NATIVE_AUDIO_ADD_PED_TO_CONVERSATION); @@ -1678,6 +1690,7 @@ namespace lua::native AUDIO.set_function("PLAY_VEHICLE_DOOR_OPEN_SOUND", LUA_NATIVE_AUDIO_PLAY_VEHICLE_DOOR_OPEN_SOUND); AUDIO.set_function("PLAY_VEHICLE_DOOR_CLOSE_SOUND", LUA_NATIVE_AUDIO_PLAY_VEHICLE_DOOR_CLOSE_SOUND); AUDIO.set_function("ENABLE_STALL_WARNING_SOUNDS", LUA_NATIVE_AUDIO_ENABLE_STALL_WARNING_SOUNDS); + AUDIO.set_function("ENABLE_DRAG_RACE_STATIONARY_WARNING_SOUNDS_", LUA_NATIVE_AUDIO_ENABLE_DRAG_RACE_STATIONARY_WARNING_SOUNDS_); AUDIO.set_function("IS_GAME_IN_CONTROL_OF_MUSIC", LUA_NATIVE_AUDIO_IS_GAME_IN_CONTROL_OF_MUSIC); AUDIO.set_function("SET_GPS_ACTIVE", LUA_NATIVE_AUDIO_SET_GPS_ACTIVE); AUDIO.set_function("PLAY_MISSION_COMPLETE_AUDIO", LUA_NATIVE_AUDIO_PLAY_MISSION_COMPLETE_AUDIO); diff --git a/src/lua/natives/lua_native_binding_BRAIN.cpp b/src/lua/natives/lua_native_binding_BRAIN.cpp index 0f92b084..5e60ef99 100644 --- a/src/lua/natives/lua_native_binding_BRAIN.cpp +++ b/src/lua/natives/lua_native_binding_BRAIN.cpp @@ -3,14 +3,14 @@ namespace lua::native { - static void LUA_NATIVE_BRAIN_ADD_SCRIPT_TO_RANDOM_PED(const char* name, Hash model, float p2, float p3) + static void LUA_NATIVE_BRAIN_ADD_SCRIPT_TO_RANDOM_PED(sol::stack_object name, Hash model, float p2, float p3) { - BRAIN::ADD_SCRIPT_TO_RANDOM_PED(name, model, p2, p3); + BRAIN::ADD_SCRIPT_TO_RANDOM_PED(name.is() ? name.as() : nullptr, model, p2, p3); } - static void LUA_NATIVE_BRAIN_REGISTER_OBJECT_SCRIPT_BRAIN(const char* scriptName, Hash modelHash, int p2, float activationRange, int p4, int p5) + static void LUA_NATIVE_BRAIN_REGISTER_OBJECT_SCRIPT_BRAIN(sol::stack_object scriptName, Hash modelHash, int p2, float activationRange, int p4, int p5) { - BRAIN::REGISTER_OBJECT_SCRIPT_BRAIN(scriptName, modelHash, p2, activationRange, p4, p5); + BRAIN::REGISTER_OBJECT_SCRIPT_BRAIN(scriptName.is() ? scriptName.as() : nullptr, modelHash, p2, activationRange, p4, p5); } static bool LUA_NATIVE_BRAIN_IS_OBJECT_WITHIN_BRAIN_ACTIVATION_RANGE(Object object) @@ -19,9 +19,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_BRAIN_REGISTER_WORLD_POINT_SCRIPT_BRAIN(const char* scriptName, float activationRange, int p2) + static void LUA_NATIVE_BRAIN_REGISTER_WORLD_POINT_SCRIPT_BRAIN(sol::stack_object scriptName, float activationRange, int p2) { - BRAIN::REGISTER_WORLD_POINT_SCRIPT_BRAIN(scriptName, activationRange, p2); + BRAIN::REGISTER_WORLD_POINT_SCRIPT_BRAIN(scriptName.is() ? scriptName.as() : nullptr, activationRange, p2); } static bool LUA_NATIVE_BRAIN_IS_WORLD_POINT_WITHIN_BRAIN_ACTIVATION_RANGE() @@ -50,14 +50,14 @@ namespace lua::native BRAIN::REACTIVATE_ALL_OBJECT_BRAINS_THAT_ARE_WAITING_TILL_OUT_OF_RANGE(); } - static void LUA_NATIVE_BRAIN_REACTIVATE_NAMED_WORLD_BRAINS_WAITING_TILL_OUT_OF_RANGE(const char* scriptName) + static void LUA_NATIVE_BRAIN_REACTIVATE_NAMED_WORLD_BRAINS_WAITING_TILL_OUT_OF_RANGE(sol::stack_object scriptName) { - BRAIN::REACTIVATE_NAMED_WORLD_BRAINS_WAITING_TILL_OUT_OF_RANGE(scriptName); + BRAIN::REACTIVATE_NAMED_WORLD_BRAINS_WAITING_TILL_OUT_OF_RANGE(scriptName.is() ? scriptName.as() : nullptr); } - static void LUA_NATIVE_BRAIN_REACTIVATE_NAMED_OBJECT_BRAINS_WAITING_TILL_OUT_OF_RANGE(const char* scriptName) + static void LUA_NATIVE_BRAIN_REACTIVATE_NAMED_OBJECT_BRAINS_WAITING_TILL_OUT_OF_RANGE(sol::stack_object scriptName) { - BRAIN::REACTIVATE_NAMED_OBJECT_BRAINS_WAITING_TILL_OUT_OF_RANGE(scriptName); + BRAIN::REACTIVATE_NAMED_OBJECT_BRAINS_WAITING_TILL_OUT_OF_RANGE(scriptName.is() ? scriptName.as() : nullptr); } void init_native_binding_BRAIN(sol::state& L) diff --git a/src/lua/natives/lua_native_binding_CAM.cpp b/src/lua/natives/lua_native_binding_CAM.cpp index e833ba31..cbfaf9e8 100644 --- a/src/lua/natives/lua_native_binding_CAM.cpp +++ b/src/lua/natives/lua_native_binding_CAM.cpp @@ -13,15 +13,15 @@ namespace lua::native CAM::STOP_RENDERING_SCRIPT_CAMS_USING_CATCH_UP(render, p1, p2, p3); } - static Cam LUA_NATIVE_CAM_CREATE_CAM(const char* camName, bool p1) + static Cam LUA_NATIVE_CAM_CREATE_CAM(sol::stack_object camName, bool p1) { - auto retval = CAM::CREATE_CAM(camName, p1); + auto retval = CAM::CREATE_CAM(camName.is() ? camName.as() : nullptr, p1); return retval; } - static Cam LUA_NATIVE_CAM_CREATE_CAM_WITH_PARAMS(const char* camName, float posX, float posY, float posZ, float rotX, float rotY, float rotZ, float fov, bool p8, int p9) + static Cam LUA_NATIVE_CAM_CREATE_CAM_WITH_PARAMS(sol::stack_object camName, float posX, float posY, float posZ, float rotX, float rotY, float rotZ, float fov, bool p8, int p9) { - auto retval = CAM::CREATE_CAM_WITH_PARAMS(camName, posX, posY, posZ, rotX, rotY, rotZ, fov, p8, p9); + auto retval = CAM::CREATE_CAM_WITH_PARAMS(camName.is() ? camName.as() : nullptr, posX, posY, posZ, rotX, rotY, rotZ, fov, p8, p9); return retval; } @@ -314,9 +314,9 @@ namespace lua::native CAM::ALLOW_MOTION_BLUR_DECAY(p0, p1); } - static void LUA_NATIVE_CAM_SET_CAM_DEBUG_NAME(Cam camera, const char* name) + static void LUA_NATIVE_CAM_SET_CAM_DEBUG_NAME(Cam camera, sol::stack_object name) { - CAM::SET_CAM_DEBUG_NAME(camera, name); + CAM::SET_CAM_DEBUG_NAME(camera, name.is() ? name.as() : nullptr); } static Cam LUA_NATIVE_CAM_GET_DEBUG_CAM() @@ -420,14 +420,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_CAM_SHAKE_CAM(Cam cam, const char* type, float amplitude) + static void LUA_NATIVE_CAM_SHAKE_CAM(Cam cam, sol::stack_object type, float amplitude) { - CAM::SHAKE_CAM(cam, type, amplitude); + CAM::SHAKE_CAM(cam, type.is() ? type.as() : nullptr, amplitude); } - static void LUA_NATIVE_CAM_ANIMATED_SHAKE_CAM(Cam cam, const char* p1, const char* p2, const char* p3, float amplitude) + static void LUA_NATIVE_CAM_ANIMATED_SHAKE_CAM(Cam cam, sol::stack_object p1, sol::stack_object p2, sol::stack_object p3, float amplitude) { - CAM::ANIMATED_SHAKE_CAM(cam, p1, p2, p3, amplitude); + CAM::ANIMATED_SHAKE_CAM(cam, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3.is() ? p3.as() : nullptr, amplitude); } static bool LUA_NATIVE_CAM_IS_CAM_SHAKING(Cam cam) @@ -446,14 +446,14 @@ namespace lua::native CAM::STOP_CAM_SHAKING(cam, p1); } - static void LUA_NATIVE_CAM_SHAKE_SCRIPT_GLOBAL(const char* p0, float p1) + static void LUA_NATIVE_CAM_SHAKE_SCRIPT_GLOBAL(sol::stack_object p0, float p1) { - CAM::SHAKE_SCRIPT_GLOBAL(p0, p1); + CAM::SHAKE_SCRIPT_GLOBAL(p0.is() ? p0.as() : nullptr, p1); } - static void LUA_NATIVE_CAM_ANIMATED_SHAKE_SCRIPT_GLOBAL(const char* p0, const char* p1, const char* p2, float p3) + static void LUA_NATIVE_CAM_ANIMATED_SHAKE_SCRIPT_GLOBAL(sol::stack_object p0, sol::stack_object p1, sol::stack_object p2, float p3) { - CAM::ANIMATED_SHAKE_SCRIPT_GLOBAL(p0, p1, p2, p3); + CAM::ANIMATED_SHAKE_SCRIPT_GLOBAL(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3); } static bool LUA_NATIVE_CAM_IS_SCRIPT_GLOBAL_SHAKING() @@ -472,15 +472,15 @@ namespace lua::native CAM::TRIGGER_VEHICLE_PART_BROKEN_CAMERA_SHAKE(vehicle, p1, p2); } - static bool LUA_NATIVE_CAM_PLAY_CAM_ANIM(Cam cam, const char* animName, const char* animDictionary, float x, float y, float z, float xRot, float yRot, float zRot, bool p9, int p10) + static bool LUA_NATIVE_CAM_PLAY_CAM_ANIM(Cam cam, sol::stack_object animName, sol::stack_object animDictionary, float x, float y, float z, float xRot, float yRot, float zRot, bool p9, int p10) { - auto retval = (bool)CAM::PLAY_CAM_ANIM(cam, animName, animDictionary, x, y, z, xRot, yRot, zRot, p9, p10); + auto retval = (bool)CAM::PLAY_CAM_ANIM(cam, animName.is() ? animName.as() : nullptr, animDictionary.is() ? animDictionary.as() : nullptr, x, y, z, xRot, yRot, zRot, p9, p10); return retval; } - static bool LUA_NATIVE_CAM_IS_CAM_PLAYING_ANIM(Cam cam, const char* animName, const char* animDictionary) + static bool LUA_NATIVE_CAM_IS_CAM_PLAYING_ANIM(Cam cam, sol::stack_object animName, sol::stack_object animDictionary) { - auto retval = (bool)CAM::IS_CAM_PLAYING_ANIM(cam, animName, animDictionary); + auto retval = (bool)CAM::IS_CAM_PLAYING_ANIM(cam, animName.is() ? animName.as() : nullptr, animDictionary.is() ? animDictionary.as() : nullptr); return retval; } @@ -495,9 +495,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_CAM_PLAY_SYNCHRONIZED_CAM_ANIM(Any p0, Any p1, const char* animName, const char* animDictionary) + static bool LUA_NATIVE_CAM_PLAY_SYNCHRONIZED_CAM_ANIM(Any p0, Any p1, sol::stack_object animName, sol::stack_object animDictionary) { - auto retval = (bool)CAM::PLAY_SYNCHRONIZED_CAM_ANIM(p0, p1, animName, animDictionary); + auto retval = (bool)CAM::PLAY_SYNCHRONIZED_CAM_ANIM(p0, p1, animName.is() ? animName.as() : nullptr, animDictionary.is() ? animDictionary.as() : nullptr); return retval; } @@ -657,9 +657,9 @@ namespace lua::native CAM::SET_SCRIPTED_CAMERA_IS_FIRST_PERSON_THIS_FRAME(p0); } - static void LUA_NATIVE_CAM_SHAKE_GAMEPLAY_CAM(const char* shakeName, float intensity) + static void LUA_NATIVE_CAM_SHAKE_GAMEPLAY_CAM(sol::stack_object shakeName, float intensity) { - CAM::SHAKE_GAMEPLAY_CAM(shakeName, intensity); + CAM::SHAKE_GAMEPLAY_CAM(shakeName.is() ? shakeName.as() : nullptr, intensity); } static bool LUA_NATIVE_CAM_IS_GAMEPLAY_CAM_SHAKING() @@ -759,9 +759,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_CAM_SET_FOLLOW_PED_CAM_THIS_UPDATE(const char* camName, int p1) + static bool LUA_NATIVE_CAM_SET_FOLLOW_PED_CAM_THIS_UPDATE(sol::stack_object camName, int p1) { - auto retval = (bool)CAM::SET_FOLLOW_PED_CAM_THIS_UPDATE(camName, p1); + auto retval = (bool)CAM::SET_FOLLOW_PED_CAM_THIS_UPDATE(camName.is() ? camName.as() : nullptr, p1); return retval; } @@ -790,6 +790,18 @@ namespace lua::native CAM::SET_THIRD_PERSON_CAM_ORBIT_DISTANCE_LIMITS_THIS_UPDATE(p0, distance); } + static float LUA_NATIVE_CAM_GET_THIRD_PERSON_CAM_MIN_ORBIT_DISTANCE_SPRING_() + { + auto retval = CAM::_GET_THIRD_PERSON_CAM_MIN_ORBIT_DISTANCE_SPRING(); + return retval; + } + + static float LUA_NATIVE_CAM_GET_THIRD_PERSON_CAM_MAX_ORBIT_DISTANCE_SPRING_() + { + auto retval = CAM::_GET_THIRD_PERSON_CAM_MAX_ORBIT_DISTANCE_SPRING(); + return retval; + } + static void LUA_NATIVE_CAM_SET_IN_VEHICLE_CAM_STATE_THIS_UPDATE(Vehicle p0, int p1) { CAM::SET_IN_VEHICLE_CAM_STATE_THIS_UPDATE(p0, p1); @@ -893,9 +905,9 @@ namespace lua::native CAM::USE_VEHICLE_CAM_STUNT_SETTINGS_THIS_UPDATE(); } - static void LUA_NATIVE_CAM_USE_DEDICATED_STUNT_CAMERA_THIS_UPDATE(const char* camName) + static void LUA_NATIVE_CAM_USE_DEDICATED_STUNT_CAMERA_THIS_UPDATE(sol::stack_object camName) { - CAM::USE_DEDICATED_STUNT_CAMERA_THIS_UPDATE(camName); + CAM::USE_DEDICATED_STUNT_CAMERA_THIS_UPDATE(camName.is() ? camName.as() : nullptr); } static void LUA_NATIVE_CAM_FORCE_VEHICLE_CAM_STUNT_SETTINGS_THIS_UPDATE() @@ -1130,9 +1142,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_CAM_SHAKE_CINEMATIC_CAM(const char* shakeType, float amount) + static void LUA_NATIVE_CAM_SHAKE_CINEMATIC_CAM(sol::stack_object shakeType, float amount) { - CAM::SHAKE_CINEMATIC_CAM(shakeType, amount); + CAM::SHAKE_CINEMATIC_CAM(shakeType.is() ? shakeType.as() : nullptr, amount); } static bool LUA_NATIVE_CAM_IS_CINEMATIC_CAM_SHAKING() @@ -1279,9 +1291,9 @@ namespace lua::native CAM::SET_FIRST_PERSON_FLASH_EFFECT_TYPE(p0); } - static void LUA_NATIVE_CAM_SET_FIRST_PERSON_FLASH_EFFECT_VEHICLE_MODEL_NAME(const char* vehicleName) + static void LUA_NATIVE_CAM_SET_FIRST_PERSON_FLASH_EFFECT_VEHICLE_MODEL_NAME(sol::stack_object vehicleName) { - CAM::SET_FIRST_PERSON_FLASH_EFFECT_VEHICLE_MODEL_NAME(vehicleName); + CAM::SET_FIRST_PERSON_FLASH_EFFECT_VEHICLE_MODEL_NAME(vehicleName.is() ? vehicleName.as() : nullptr); } static void LUA_NATIVE_CAM_SET_FIRST_PERSON_FLASH_EFFECT_VEHICLE_MODEL_HASH(Hash vehicleModel) @@ -1457,6 +1469,8 @@ namespace lua::native CAM.set_function("SET_THIRD_PERSON_CAM_RELATIVE_HEADING_LIMITS_THIS_UPDATE", LUA_NATIVE_CAM_SET_THIRD_PERSON_CAM_RELATIVE_HEADING_LIMITS_THIS_UPDATE); CAM.set_function("SET_THIRD_PERSON_CAM_RELATIVE_PITCH_LIMITS_THIS_UPDATE", LUA_NATIVE_CAM_SET_THIRD_PERSON_CAM_RELATIVE_PITCH_LIMITS_THIS_UPDATE); CAM.set_function("SET_THIRD_PERSON_CAM_ORBIT_DISTANCE_LIMITS_THIS_UPDATE", LUA_NATIVE_CAM_SET_THIRD_PERSON_CAM_ORBIT_DISTANCE_LIMITS_THIS_UPDATE); + CAM.set_function("GET_THIRD_PERSON_CAM_MIN_ORBIT_DISTANCE_SPRING_", LUA_NATIVE_CAM_GET_THIRD_PERSON_CAM_MIN_ORBIT_DISTANCE_SPRING_); + CAM.set_function("GET_THIRD_PERSON_CAM_MAX_ORBIT_DISTANCE_SPRING_", LUA_NATIVE_CAM_GET_THIRD_PERSON_CAM_MAX_ORBIT_DISTANCE_SPRING_); CAM.set_function("SET_IN_VEHICLE_CAM_STATE_THIS_UPDATE", LUA_NATIVE_CAM_SET_IN_VEHICLE_CAM_STATE_THIS_UPDATE); CAM.set_function("DISABLE_ON_FOOT_FIRST_PERSON_VIEW_THIS_UPDATE", LUA_NATIVE_CAM_DISABLE_ON_FOOT_FIRST_PERSON_VIEW_THIS_UPDATE); CAM.set_function("DISABLE_FIRST_PERSON_FLASH_EFFECT_THIS_UPDATE", LUA_NATIVE_CAM_DISABLE_FIRST_PERSON_FLASH_EFFECT_THIS_UPDATE); diff --git a/src/lua/natives/lua_native_binding_CUTSCENE.cpp b/src/lua/natives/lua_native_binding_CUTSCENE.cpp index 12e50e12..b475e964 100644 --- a/src/lua/natives/lua_native_binding_CUTSCENE.cpp +++ b/src/lua/natives/lua_native_binding_CUTSCENE.cpp @@ -3,14 +3,14 @@ namespace lua::native { - static void LUA_NATIVE_CUTSCENE_REQUEST_CUTSCENE(const char* cutsceneName, int flags) + static void LUA_NATIVE_CUTSCENE_REQUEST_CUTSCENE(sol::stack_object cutsceneName, int flags) { - CUTSCENE::REQUEST_CUTSCENE(cutsceneName, flags); + CUTSCENE::REQUEST_CUTSCENE(cutsceneName.is() ? cutsceneName.as() : nullptr, flags); } - static void LUA_NATIVE_CUTSCENE_REQUEST_CUTSCENE_WITH_PLAYBACK_LIST(const char* cutsceneName, int playbackFlags, int flags) + static void LUA_NATIVE_CUTSCENE_REQUEST_CUTSCENE_WITH_PLAYBACK_LIST(sol::stack_object cutsceneName, int playbackFlags, int flags) { - CUTSCENE::REQUEST_CUTSCENE_WITH_PLAYBACK_LIST(cutsceneName, playbackFlags, flags); + CUTSCENE::REQUEST_CUTSCENE_WITH_PLAYBACK_LIST(cutsceneName.is() ? cutsceneName.as() : nullptr, playbackFlags, flags); } static void LUA_NATIVE_CUTSCENE_REMOVE_CUTSCENE() @@ -24,9 +24,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_CUTSCENE_HAS_THIS_CUTSCENE_LOADED(const char* cutsceneName) + static bool LUA_NATIVE_CUTSCENE_HAS_THIS_CUTSCENE_LOADED(sol::stack_object cutsceneName) { - auto retval = (bool)CUTSCENE::HAS_THIS_CUTSCENE_LOADED(cutsceneName); + auto retval = (bool)CUTSCENE::HAS_THIS_CUTSCENE_LOADED(cutsceneName.is() ? cutsceneName.as() : nullptr); return retval; } @@ -47,30 +47,30 @@ namespace lua::native return retval; } - static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_ENTITY_STREAMING_FLAGS(const char* cutsceneEntName, int p1, int p2) + static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_ENTITY_STREAMING_FLAGS(sol::stack_object cutsceneEntName, int p1, int p2) { - CUTSCENE::SET_CUTSCENE_ENTITY_STREAMING_FLAGS(cutsceneEntName, p1, p2); + CUTSCENE::SET_CUTSCENE_ENTITY_STREAMING_FLAGS(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, p1, p2); } - static void LUA_NATIVE_CUTSCENE_REQUEST_CUT_FILE(const char* cutsceneName) + static void LUA_NATIVE_CUTSCENE_REQUEST_CUT_FILE(sol::stack_object cutsceneName) { - CUTSCENE::REQUEST_CUT_FILE(cutsceneName); + CUTSCENE::REQUEST_CUT_FILE(cutsceneName.is() ? cutsceneName.as() : nullptr); } - static bool LUA_NATIVE_CUTSCENE_HAS_CUT_FILE_LOADED(const char* cutsceneName) + static bool LUA_NATIVE_CUTSCENE_HAS_CUT_FILE_LOADED(sol::stack_object cutsceneName) { - auto retval = (bool)CUTSCENE::HAS_CUT_FILE_LOADED(cutsceneName); + auto retval = (bool)CUTSCENE::HAS_CUT_FILE_LOADED(cutsceneName.is() ? cutsceneName.as() : nullptr); return retval; } - static void LUA_NATIVE_CUTSCENE_REMOVE_CUT_FILE(const char* cutsceneName) + static void LUA_NATIVE_CUTSCENE_REMOVE_CUT_FILE(sol::stack_object cutsceneName) { - CUTSCENE::REMOVE_CUT_FILE(cutsceneName); + CUTSCENE::REMOVE_CUT_FILE(cutsceneName.is() ? cutsceneName.as() : nullptr); } - static int LUA_NATIVE_CUTSCENE_GET_CUT_FILE_CONCAT_COUNT(const char* cutsceneName) + static int LUA_NATIVE_CUTSCENE_GET_CUT_FILE_CONCAT_COUNT(sol::stack_object cutsceneName) { - auto retval = CUTSCENE::GET_CUT_FILE_CONCAT_COUNT(cutsceneName); + auto retval = CUTSCENE::GET_CUT_FILE_CONCAT_COUNT(cutsceneName.is() ? cutsceneName.as() : nullptr); return retval; } @@ -158,9 +158,9 @@ namespace lua::native return retval; } - static Entity LUA_NATIVE_CUTSCENE_GET_ENTITY_INDEX_OF_CUTSCENE_ENTITY(const char* cutsceneEntName, Hash modelHash) + static Entity LUA_NATIVE_CUTSCENE_GET_ENTITY_INDEX_OF_CUTSCENE_ENTITY(sol::stack_object cutsceneEntName, Hash modelHash) { - auto retval = CUTSCENE::GET_ENTITY_INDEX_OF_CUTSCENE_ENTITY(cutsceneEntName, modelHash); + auto retval = CUTSCENE::GET_ENTITY_INDEX_OF_CUTSCENE_ENTITY(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, modelHash); return retval; } @@ -170,9 +170,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_CUTSCENE_IS_CUTSCENE_AUTHORIZED(const char* cutsceneName) + static bool LUA_NATIVE_CUTSCENE_IS_CUTSCENE_AUTHORIZED(sol::stack_object cutsceneName) { - auto retval = (bool)CUTSCENE::IS_CUTSCENE_AUTHORIZED(cutsceneName); + auto retval = (bool)CUTSCENE::IS_CUTSCENE_AUTHORIZED(cutsceneName.is() ? cutsceneName.as() : nullptr); return retval; } @@ -182,14 +182,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_CUTSCENE_REGISTER_ENTITY_FOR_CUTSCENE(Ped cutscenePed, const char* cutsceneEntName, int p2, Hash modelHash, int p4) + static void LUA_NATIVE_CUTSCENE_REGISTER_ENTITY_FOR_CUTSCENE(Ped cutscenePed, sol::stack_object cutsceneEntName, int p2, Hash modelHash, int p4) { - CUTSCENE::REGISTER_ENTITY_FOR_CUTSCENE(cutscenePed, cutsceneEntName, p2, modelHash, p4); + CUTSCENE::REGISTER_ENTITY_FOR_CUTSCENE(cutscenePed, cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, p2, modelHash, p4); } - static Entity LUA_NATIVE_CUTSCENE_GET_ENTITY_INDEX_OF_REGISTERED_ENTITY(const char* cutsceneEntName, Hash modelHash) + static Entity LUA_NATIVE_CUTSCENE_GET_ENTITY_INDEX_OF_REGISTERED_ENTITY(sol::stack_object cutsceneEntName, Hash modelHash) { - auto retval = CUTSCENE::GET_ENTITY_INDEX_OF_REGISTERED_ENTITY(cutsceneEntName, modelHash); + auto retval = CUTSCENE::GET_ENTITY_INDEX_OF_REGISTERED_ENTITY(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, modelHash); return retval; } @@ -203,15 +203,15 @@ namespace lua::native CUTSCENE::SET_CUTSCENE_TRIGGER_AREA(x1, y1, z1, x2, y2, z2); } - static bool LUA_NATIVE_CUTSCENE_CAN_SET_ENTER_STATE_FOR_REGISTERED_ENTITY(const char* cutsceneEntName, Hash modelHash) + static bool LUA_NATIVE_CUTSCENE_CAN_SET_ENTER_STATE_FOR_REGISTERED_ENTITY(sol::stack_object cutsceneEntName, Hash modelHash) { - auto retval = (bool)CUTSCENE::CAN_SET_ENTER_STATE_FOR_REGISTERED_ENTITY(cutsceneEntName, modelHash); + auto retval = (bool)CUTSCENE::CAN_SET_ENTER_STATE_FOR_REGISTERED_ENTITY(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, modelHash); return retval; } - static bool LUA_NATIVE_CUTSCENE_CAN_SET_EXIT_STATE_FOR_REGISTERED_ENTITY(const char* cutsceneEntName, Hash modelHash) + static bool LUA_NATIVE_CUTSCENE_CAN_SET_EXIT_STATE_FOR_REGISTERED_ENTITY(sol::stack_object cutsceneEntName, Hash modelHash) { - auto retval = (bool)CUTSCENE::CAN_SET_EXIT_STATE_FOR_REGISTERED_ENTITY(cutsceneEntName, modelHash); + auto retval = (bool)CUTSCENE::CAN_SET_EXIT_STATE_FOR_REGISTERED_ENTITY(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, modelHash); return retval; } @@ -273,25 +273,25 @@ namespace lua::native CUTSCENE::SET_CAN_DISPLAY_MINIMAP_DURING_CUTSCENE_THIS_UPDATE(); } - static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_COMPONENT_VARIATION(const char* cutsceneEntName, int componentId, int drawableId, int textureId, Hash modelHash) + static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_COMPONENT_VARIATION(sol::stack_object cutsceneEntName, int componentId, int drawableId, int textureId, Hash modelHash) { - CUTSCENE::SET_CUTSCENE_PED_COMPONENT_VARIATION(cutsceneEntName, componentId, drawableId, textureId, modelHash); + CUTSCENE::SET_CUTSCENE_PED_COMPONENT_VARIATION(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, componentId, drawableId, textureId, modelHash); } - static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_COMPONENT_VARIATION_FROM_PED(const char* cutsceneEntName, Ped ped, Hash modelHash) + static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_COMPONENT_VARIATION_FROM_PED(sol::stack_object cutsceneEntName, Ped ped, Hash modelHash) { - CUTSCENE::SET_CUTSCENE_PED_COMPONENT_VARIATION_FROM_PED(cutsceneEntName, ped, modelHash); + CUTSCENE::SET_CUTSCENE_PED_COMPONENT_VARIATION_FROM_PED(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, ped, modelHash); } - static bool LUA_NATIVE_CUTSCENE_DOES_CUTSCENE_ENTITY_EXIST(const char* cutsceneEntName, Hash modelHash) + static bool LUA_NATIVE_CUTSCENE_DOES_CUTSCENE_ENTITY_EXIST(sol::stack_object cutsceneEntName, Hash modelHash) { - auto retval = (bool)CUTSCENE::DOES_CUTSCENE_ENTITY_EXIST(cutsceneEntName, modelHash); + auto retval = (bool)CUTSCENE::DOES_CUTSCENE_ENTITY_EXIST(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, modelHash); return retval; } - static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_PROP_VARIATION(const char* cutsceneEntName, int componentId, int drawableId, int textureId, Hash modelHash) + static void LUA_NATIVE_CUTSCENE_SET_CUTSCENE_PED_PROP_VARIATION(sol::stack_object cutsceneEntName, int componentId, int drawableId, int textureId, Hash modelHash) { - CUTSCENE::SET_CUTSCENE_PED_PROP_VARIATION(cutsceneEntName, componentId, drawableId, textureId, modelHash); + CUTSCENE::SET_CUTSCENE_PED_PROP_VARIATION(cutsceneEntName.is() ? cutsceneEntName.as() : nullptr, componentId, drawableId, textureId, modelHash); } static bool LUA_NATIVE_CUTSCENE_HAS_CUTSCENE_CUT_THIS_FRAME() diff --git a/src/lua/natives/lua_native_binding_DATAFILE.cpp b/src/lua/natives/lua_native_binding_DATAFILE.cpp index 2f5b03d2..cb2cc3d9 100644 --- a/src/lua/natives/lua_native_binding_DATAFILE.cpp +++ b/src/lua/natives/lua_native_binding_DATAFILE.cpp @@ -43,39 +43,39 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_DATAFILE_UGC_CREATE_CONTENT(Any data, int dataCount, const char* contentName, const char* description, const char* tagsCsv, const char* contentTypeName, bool publish, Any p7) + static std::tuple LUA_NATIVE_DATAFILE_UGC_CREATE_CONTENT(Any data, int dataCount, sol::stack_object contentName, sol::stack_object description, sol::stack_object tagsCsv, sol::stack_object contentTypeName, bool publish, Any p7) { std::tuple return_values; - std::get<0>(return_values) = (bool)DATAFILE::UGC_CREATE_CONTENT(&data, dataCount, contentName, description, tagsCsv, contentTypeName, publish, p7); + std::get<0>(return_values) = (bool)DATAFILE::UGC_CREATE_CONTENT(&data, dataCount, contentName.is() ? contentName.as() : nullptr, description.is() ? description.as() : nullptr, tagsCsv.is() ? tagsCsv.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr, publish, p7); std::get<1>(return_values) = data; return return_values; } - static bool LUA_NATIVE_DATAFILE_UGC_CREATE_MISSION(const char* contentName, const char* description, const char* tagsCsv, const char* contentTypeName, bool publish, Any p5) + static bool LUA_NATIVE_DATAFILE_UGC_CREATE_MISSION(sol::stack_object contentName, sol::stack_object description, sol::stack_object tagsCsv, sol::stack_object contentTypeName, bool publish, Any p5) { - auto retval = (bool)DATAFILE::UGC_CREATE_MISSION(contentName, description, tagsCsv, contentTypeName, publish, p5); + auto retval = (bool)DATAFILE::UGC_CREATE_MISSION(contentName.is() ? contentName.as() : nullptr, description.is() ? description.as() : nullptr, tagsCsv.is() ? tagsCsv.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr, publish, p5); return retval; } - static std::tuple LUA_NATIVE_DATAFILE_UGC_UPDATE_CONTENT(const char* contentId, Any data, int dataCount, const char* contentName, const char* description, const char* tagsCsv, const char* contentTypeName, Any p7) + static std::tuple LUA_NATIVE_DATAFILE_UGC_UPDATE_CONTENT(sol::stack_object contentId, Any data, int dataCount, sol::stack_object contentName, sol::stack_object description, sol::stack_object tagsCsv, sol::stack_object contentTypeName, Any p7) { std::tuple return_values; - std::get<0>(return_values) = (bool)DATAFILE::UGC_UPDATE_CONTENT(contentId, &data, dataCount, contentName, description, tagsCsv, contentTypeName, p7); + std::get<0>(return_values) = (bool)DATAFILE::UGC_UPDATE_CONTENT(contentId.is() ? contentId.as() : nullptr, &data, dataCount, contentName.is() ? contentName.as() : nullptr, description.is() ? description.as() : nullptr, tagsCsv.is() ? tagsCsv.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr, p7); std::get<1>(return_values) = data; return return_values; } - static bool LUA_NATIVE_DATAFILE_UGC_UPDATE_MISSION(const char* contentId, const char* contentName, const char* description, const char* tagsCsv, const char* contentTypeName, Any p5) + static bool LUA_NATIVE_DATAFILE_UGC_UPDATE_MISSION(sol::stack_object contentId, sol::stack_object contentName, sol::stack_object description, sol::stack_object tagsCsv, sol::stack_object contentTypeName, Any p5) { - auto retval = (bool)DATAFILE::UGC_UPDATE_MISSION(contentId, contentName, description, tagsCsv, contentTypeName, p5); + auto retval = (bool)DATAFILE::UGC_UPDATE_MISSION(contentId.is() ? contentId.as() : nullptr, contentName.is() ? contentName.as() : nullptr, description.is() ? description.as() : nullptr, tagsCsv.is() ? tagsCsv.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr, p5); return retval; } - static bool LUA_NATIVE_DATAFILE_UGC_SET_PLAYER_DATA(const char* contentId, float rating, const char* contentTypeName, Any p3) + static bool LUA_NATIVE_DATAFILE_UGC_SET_PLAYER_DATA(sol::stack_object contentId, float rating, sol::stack_object contentTypeName, Any p3) { - auto retval = (bool)DATAFILE::UGC_SET_PLAYER_DATA(contentId, rating, contentTypeName, p3); + auto retval = (bool)DATAFILE::UGC_SET_PLAYER_DATA(contentId.is() ? contentId.as() : nullptr, rating, contentTypeName.is() ? contentTypeName.as() : nullptr, p3); return retval; } @@ -103,9 +103,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_DATAFILE_DATAFILE_LOAD_OFFLINE_UGC(const char* filename, Any p1) + static bool LUA_NATIVE_DATAFILE_DATAFILE_LOAD_OFFLINE_UGC(sol::stack_object filename, Any p1) { - auto retval = (bool)DATAFILE::DATAFILE_LOAD_OFFLINE_UGC(filename, p1); + auto retval = (bool)DATAFILE::DATAFILE_LOAD_OFFLINE_UGC(filename.is() ? filename.as() : nullptr, p1); return retval; } @@ -135,9 +135,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_DATAFILE_DATAFILE_START_SAVE_TO_CLOUD(const char* filename, Any p1) + static bool LUA_NATIVE_DATAFILE_DATAFILE_START_SAVE_TO_CLOUD(sol::stack_object filename, Any p1) { - auto retval = (bool)DATAFILE::DATAFILE_START_SAVE_TO_CLOUD(filename, p1); + auto retval = (bool)DATAFILE::DATAFILE_START_SAVE_TO_CLOUD(filename.is() ? filename.as() : nullptr, p1); return retval; } @@ -173,121 +173,121 @@ namespace lua::native return retval; } - static Any LUA_NATIVE_DATAFILE_DATADICT_SET_BOOL(Any objectData, const char* key, bool value) + static Any LUA_NATIVE_DATAFILE_DATADICT_SET_BOOL(Any objectData, sol::stack_object key, bool value) { - DATAFILE::DATADICT_SET_BOOL(&objectData, key, value); + DATAFILE::DATADICT_SET_BOOL(&objectData, key.is() ? key.as() : nullptr, value); return objectData; } - static Any LUA_NATIVE_DATAFILE_DATADICT_SET_INT(Any objectData, const char* key, int value) + static Any LUA_NATIVE_DATAFILE_DATADICT_SET_INT(Any objectData, sol::stack_object key, int value) { - DATAFILE::DATADICT_SET_INT(&objectData, key, value); + DATAFILE::DATADICT_SET_INT(&objectData, key.is() ? key.as() : nullptr, value); return objectData; } - static Any LUA_NATIVE_DATAFILE_DATADICT_SET_FLOAT(Any objectData, const char* key, float value) + static Any LUA_NATIVE_DATAFILE_DATADICT_SET_FLOAT(Any objectData, sol::stack_object key, float value) { - DATAFILE::DATADICT_SET_FLOAT(&objectData, key, value); + DATAFILE::DATADICT_SET_FLOAT(&objectData, key.is() ? key.as() : nullptr, value); return objectData; } - static Any LUA_NATIVE_DATAFILE_DATADICT_SET_STRING(Any objectData, const char* key, const char* value) + static Any LUA_NATIVE_DATAFILE_DATADICT_SET_STRING(Any objectData, sol::stack_object key, sol::stack_object value) { - DATAFILE::DATADICT_SET_STRING(&objectData, key, value); + DATAFILE::DATADICT_SET_STRING(&objectData, key.is() ? key.as() : nullptr, value.is() ? value.as() : nullptr); return objectData; } - static Any LUA_NATIVE_DATAFILE_DATADICT_SET_VECTOR(Any objectData, const char* key, float valueX, float valueY, float valueZ) + static Any LUA_NATIVE_DATAFILE_DATADICT_SET_VECTOR(Any objectData, sol::stack_object key, float valueX, float valueY, float valueZ) { - DATAFILE::DATADICT_SET_VECTOR(&objectData, key, valueX, valueY, valueZ); + DATAFILE::DATADICT_SET_VECTOR(&objectData, key.is() ? key.as() : nullptr, valueX, valueY, valueZ); return objectData; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_CREATE_DICT(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_CREATE_DICT(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_CREATE_DICT(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_CREATE_DICT(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_CREATE_ARRAY(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_CREATE_ARRAY(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_CREATE_ARRAY(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_CREATE_ARRAY(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_BOOL(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_BOOL(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = (bool)DATAFILE::DATADICT_GET_BOOL(&objectData, key); + std::get<0>(return_values) = (bool)DATAFILE::DATADICT_GET_BOOL(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_INT(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_INT(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_INT(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_INT(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_FLOAT(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_FLOAT(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_FLOAT(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_FLOAT(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_STRING(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_STRING(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_STRING(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_STRING(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_VECTOR(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_VECTOR(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_VECTOR(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_VECTOR(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_DICT(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_DICT(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_DICT(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_DICT(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_ARRAY(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_ARRAY(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_ARRAY(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_ARRAY(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; } - static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_TYPE(Any objectData, const char* key) + static std::tuple LUA_NATIVE_DATAFILE_DATADICT_GET_TYPE(Any objectData, sol::stack_object key) { std::tuple return_values; - std::get<0>(return_values) = DATAFILE::DATADICT_GET_TYPE(&objectData, key); + std::get<0>(return_values) = DATAFILE::DATADICT_GET_TYPE(&objectData, key.is() ? key.as() : nullptr); std::get<1>(return_values) = objectData; return return_values; @@ -311,9 +311,9 @@ namespace lua::native return arrayData; } - static Any LUA_NATIVE_DATAFILE_DATAARRAY_ADD_STRING(Any arrayData, const char* value) + static Any LUA_NATIVE_DATAFILE_DATAARRAY_ADD_STRING(Any arrayData, sol::stack_object value) { - DATAFILE::DATAARRAY_ADD_STRING(&arrayData, value); + DATAFILE::DATAARRAY_ADD_STRING(&arrayData, value.is() ? value.as() : nullptr); return arrayData; } diff --git a/src/lua/natives/lua_native_binding_DECORATOR.cpp b/src/lua/natives/lua_native_binding_DECORATOR.cpp index 51342cda..67f37168 100644 --- a/src/lua/natives/lua_native_binding_DECORATOR.cpp +++ b/src/lua/natives/lua_native_binding_DECORATOR.cpp @@ -3,68 +3,68 @@ namespace lua::native { - static bool LUA_NATIVE_DECORATOR_DECOR_SET_TIME(Entity entity, const char* propertyName, int timestamp) + static bool LUA_NATIVE_DECORATOR_DECOR_SET_TIME(Entity entity, sol::stack_object propertyName, int timestamp) { - auto retval = (bool)DECORATOR::DECOR_SET_TIME(entity, propertyName, timestamp); + auto retval = (bool)DECORATOR::DECOR_SET_TIME(entity, propertyName.is() ? propertyName.as() : nullptr, timestamp); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_SET_BOOL(Entity entity, const char* propertyName, bool value) + static bool LUA_NATIVE_DECORATOR_DECOR_SET_BOOL(Entity entity, sol::stack_object propertyName, bool value) { - auto retval = (bool)DECORATOR::DECOR_SET_BOOL(entity, propertyName, value); + auto retval = (bool)DECORATOR::DECOR_SET_BOOL(entity, propertyName.is() ? propertyName.as() : nullptr, value); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_SET_FLOAT(Entity entity, const char* propertyName, float value) + static bool LUA_NATIVE_DECORATOR_DECOR_SET_FLOAT(Entity entity, sol::stack_object propertyName, float value) { - auto retval = (bool)DECORATOR::DECOR_SET_FLOAT(entity, propertyName, value); + auto retval = (bool)DECORATOR::DECOR_SET_FLOAT(entity, propertyName.is() ? propertyName.as() : nullptr, value); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_SET_INT(Entity entity, const char* propertyName, int value) + static bool LUA_NATIVE_DECORATOR_DECOR_SET_INT(Entity entity, sol::stack_object propertyName, int value) { - auto retval = (bool)DECORATOR::DECOR_SET_INT(entity, propertyName, value); + auto retval = (bool)DECORATOR::DECOR_SET_INT(entity, propertyName.is() ? propertyName.as() : nullptr, value); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_GET_BOOL(Entity entity, const char* propertyName) + static bool LUA_NATIVE_DECORATOR_DECOR_GET_BOOL(Entity entity, sol::stack_object propertyName) { - auto retval = (bool)DECORATOR::DECOR_GET_BOOL(entity, propertyName); + auto retval = (bool)DECORATOR::DECOR_GET_BOOL(entity, propertyName.is() ? propertyName.as() : nullptr); return retval; } - static float LUA_NATIVE_DECORATOR_DECOR_GET_FLOAT(Entity entity, const char* propertyName) + static float LUA_NATIVE_DECORATOR_DECOR_GET_FLOAT(Entity entity, sol::stack_object propertyName) { - auto retval = DECORATOR::DECOR_GET_FLOAT(entity, propertyName); + auto retval = DECORATOR::DECOR_GET_FLOAT(entity, propertyName.is() ? propertyName.as() : nullptr); return retval; } - static int LUA_NATIVE_DECORATOR_DECOR_GET_INT(Entity entity, const char* propertyName) + static int LUA_NATIVE_DECORATOR_DECOR_GET_INT(Entity entity, sol::stack_object propertyName) { - auto retval = DECORATOR::DECOR_GET_INT(entity, propertyName); + auto retval = DECORATOR::DECOR_GET_INT(entity, propertyName.is() ? propertyName.as() : nullptr); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_EXIST_ON(Entity entity, const char* propertyName) + static bool LUA_NATIVE_DECORATOR_DECOR_EXIST_ON(Entity entity, sol::stack_object propertyName) { - auto retval = (bool)DECORATOR::DECOR_EXIST_ON(entity, propertyName); + auto retval = (bool)DECORATOR::DECOR_EXIST_ON(entity, propertyName.is() ? propertyName.as() : nullptr); return retval; } - static bool LUA_NATIVE_DECORATOR_DECOR_REMOVE(Entity entity, const char* propertyName) + static bool LUA_NATIVE_DECORATOR_DECOR_REMOVE(Entity entity, sol::stack_object propertyName) { - auto retval = (bool)DECORATOR::DECOR_REMOVE(entity, propertyName); + auto retval = (bool)DECORATOR::DECOR_REMOVE(entity, propertyName.is() ? propertyName.as() : nullptr); return retval; } - static void LUA_NATIVE_DECORATOR_DECOR_REGISTER(const char* propertyName, int type) + static void LUA_NATIVE_DECORATOR_DECOR_REGISTER(sol::stack_object propertyName, int type) { - DECORATOR::DECOR_REGISTER(propertyName, type); + DECORATOR::DECOR_REGISTER(propertyName.is() ? propertyName.as() : nullptr, type); } - static bool LUA_NATIVE_DECORATOR_DECOR_IS_REGISTERED_AS_TYPE(const char* propertyName, int type) + static bool LUA_NATIVE_DECORATOR_DECOR_IS_REGISTERED_AS_TYPE(sol::stack_object propertyName, int type) { - auto retval = (bool)DECORATOR::DECOR_IS_REGISTERED_AS_TYPE(propertyName, type); + auto retval = (bool)DECORATOR::DECOR_IS_REGISTERED_AS_TYPE(propertyName.is() ? propertyName.as() : nullptr, type); return retval; } diff --git a/src/lua/natives/lua_native_binding_ENTITY.cpp b/src/lua/natives/lua_native_binding_ENTITY.cpp index 5b754244..d259419d 100644 --- a/src/lua/natives/lua_native_binding_ENTITY.cpp +++ b/src/lua/natives/lua_native_binding_ENTITY.cpp @@ -39,9 +39,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_ENTITY_HAS_ENTITY_ANIM_FINISHED(Entity entity, const char* animDict, const char* animName, int p3) + static bool LUA_NATIVE_ENTITY_HAS_ENTITY_ANIM_FINISHED(Entity entity, sol::stack_object animDict, sol::stack_object animName, int p3) { - auto retval = (bool)ENTITY::HAS_ENTITY_ANIM_FINISHED(entity, animDict, animName, p3); + auto retval = (bool)ENTITY::HAS_ENTITY_ANIM_FINISHED(entity, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, p3); return retval; } @@ -116,21 +116,21 @@ namespace lua::native ENTITY::FORCE_ENTITY_AI_AND_ANIMATION_UPDATE(entity); } - static float LUA_NATIVE_ENTITY_GET_ENTITY_ANIM_CURRENT_TIME(Entity entity, const char* animDict, const char* animName) + static float LUA_NATIVE_ENTITY_GET_ENTITY_ANIM_CURRENT_TIME(Entity entity, sol::stack_object animDict, sol::stack_object animName) { - auto retval = ENTITY::GET_ENTITY_ANIM_CURRENT_TIME(entity, animDict, animName); + auto retval = ENTITY::GET_ENTITY_ANIM_CURRENT_TIME(entity, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); return retval; } - static float LUA_NATIVE_ENTITY_GET_ENTITY_ANIM_TOTAL_TIME(Entity entity, const char* animDict, const char* animName) + static float LUA_NATIVE_ENTITY_GET_ENTITY_ANIM_TOTAL_TIME(Entity entity, sol::stack_object animDict, sol::stack_object animName) { - auto retval = ENTITY::GET_ENTITY_ANIM_TOTAL_TIME(entity, animDict, animName); + auto retval = ENTITY::GET_ENTITY_ANIM_TOTAL_TIME(entity, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); return retval; } - static float LUA_NATIVE_ENTITY_GET_ANIM_DURATION(const char* animDict, const char* animName) + static float LUA_NATIVE_ENTITY_GET_ANIM_DURATION(sol::stack_object animDict, sol::stack_object animName) { - auto retval = ENTITY::GET_ANIM_DURATION(animDict, animName); + auto retval = ENTITY::GET_ANIM_DURATION(animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); return retval; } @@ -454,9 +454,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_ENTITY_IS_ENTITY_IN_ZONE(Entity entity, const char* zone) + static bool LUA_NATIVE_ENTITY_IS_ENTITY_IN_ZONE(Entity entity, sol::stack_object zone) { - auto retval = (bool)ENTITY::IS_ENTITY_IN_ZONE(entity, zone); + auto retval = (bool)ENTITY::IS_ENTITY_IN_ZONE(entity, zone.is() ? zone.as() : nullptr); return retval; } @@ -483,9 +483,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_ENTITY_IS_ENTITY_PLAYING_ANIM(Entity entity, const char* animDict, const char* animName, int taskFlag) + static bool LUA_NATIVE_ENTITY_IS_ENTITY_PLAYING_ANIM(Entity entity, sol::stack_object animDict, sol::stack_object animName, int taskFlag) { - auto retval = (bool)ENTITY::IS_ENTITY_PLAYING_ANIM(entity, animDict, animName, taskFlag); + auto retval = (bool)ENTITY::IS_ENTITY_PLAYING_ANIM(entity, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, taskFlag); return retval; } @@ -589,9 +589,9 @@ namespace lua::native ENTITY::PROCESS_ENTITY_ATTACHMENTS(entity); } - static int LUA_NATIVE_ENTITY_GET_ENTITY_BONE_INDEX_BY_NAME(Entity entity, const char* boneName) + static int LUA_NATIVE_ENTITY_GET_ENTITY_BONE_INDEX_BY_NAME(Entity entity, sol::stack_object boneName) { - auto retval = ENTITY::GET_ENTITY_BONE_INDEX_BY_NAME(entity, boneName); + auto retval = ENTITY::GET_ENTITY_BONE_INDEX_BY_NAME(entity, boneName.is() ? boneName.as() : nullptr); return retval; } @@ -621,21 +621,21 @@ namespace lua::native ENTITY::SET_ENTITY_SHOULD_FREEZE_WAITING_ON_COLLISION(entity, toggle); } - static bool LUA_NATIVE_ENTITY_PLAY_ENTITY_ANIM(Entity entity, const char* animName, const char* animDict, float p3, bool loop, bool stayInAnim, bool p6, float delta, Any bitset) + static bool LUA_NATIVE_ENTITY_PLAY_ENTITY_ANIM(Entity entity, sol::stack_object animName, sol::stack_object animDict, float p3, bool loop, bool stayInAnim, bool p6, float delta, Any bitset) { - auto retval = (bool)ENTITY::PLAY_ENTITY_ANIM(entity, animName, animDict, p3, loop, stayInAnim, p6, delta, bitset); + auto retval = (bool)ENTITY::PLAY_ENTITY_ANIM(entity, animName.is() ? animName.as() : nullptr, animDict.is() ? animDict.as() : nullptr, p3, loop, stayInAnim, p6, delta, bitset); return retval; } - static bool LUA_NATIVE_ENTITY_PLAY_SYNCHRONIZED_ENTITY_ANIM(Entity entity, int syncedScene, const char* animation, const char* propName, float p4, float p5, Any p6, float p7) + static bool LUA_NATIVE_ENTITY_PLAY_SYNCHRONIZED_ENTITY_ANIM(Entity entity, int syncedScene, sol::stack_object animation, sol::stack_object propName, float p4, float p5, Any p6, float p7) { - auto retval = (bool)ENTITY::PLAY_SYNCHRONIZED_ENTITY_ANIM(entity, syncedScene, animation, propName, p4, p5, p6, p7); + auto retval = (bool)ENTITY::PLAY_SYNCHRONIZED_ENTITY_ANIM(entity, syncedScene, animation.is() ? animation.as() : nullptr, propName.is() ? propName.as() : nullptr, p4, p5, p6, p7); return retval; } - static bool LUA_NATIVE_ENTITY_PLAY_SYNCHRONIZED_MAP_ENTITY_ANIM(float x1, float y1, float z1, float x2, Any y2, float z2, const char* p6, const char* p7, float p8, float p9, Any p10, float p11) + static bool LUA_NATIVE_ENTITY_PLAY_SYNCHRONIZED_MAP_ENTITY_ANIM(float x1, float y1, float z1, float x2, Any y2, float z2, sol::stack_object p6, sol::stack_object p7, float p8, float p9, Any p10, float p11) { - auto retval = (bool)ENTITY::PLAY_SYNCHRONIZED_MAP_ENTITY_ANIM(x1, y1, z1, x2, y2, z2, p6, p7, p8, p9, p10, p11); + auto retval = (bool)ENTITY::PLAY_SYNCHRONIZED_MAP_ENTITY_ANIM(x1, y1, z1, x2, y2, z2, p6.is() ? p6.as() : nullptr, p7.is() ? p7.as() : nullptr, p8, p9, p10, p11); return retval; } @@ -645,9 +645,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_ENTITY_STOP_ENTITY_ANIM(Entity entity, const char* animation, const char* animGroup, float p3) + static bool LUA_NATIVE_ENTITY_STOP_ENTITY_ANIM(Entity entity, sol::stack_object animation, sol::stack_object animGroup, float p3) { - auto retval = (bool)ENTITY::STOP_ENTITY_ANIM(entity, animation, animGroup, p3); + auto retval = (bool)ENTITY::STOP_ENTITY_ANIM(entity, animation.is() ? animation.as() : nullptr, animGroup.is() ? animGroup.as() : nullptr, p3); return retval; } @@ -663,24 +663,24 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_ENTITY_FIND_ANIM_EVENT_PHASE(const char* animDictionary, const char* animName, const char* p2, Any p3, Any p4) + static std::tuple LUA_NATIVE_ENTITY_FIND_ANIM_EVENT_PHASE(sol::stack_object animDictionary, sol::stack_object animName, sol::stack_object p2, Any p3, Any p4) { std::tuple return_values; - std::get<0>(return_values) = (bool)ENTITY::FIND_ANIM_EVENT_PHASE(animDictionary, animName, p2, &p3, &p4); + std::get<0>(return_values) = (bool)ENTITY::FIND_ANIM_EVENT_PHASE(animDictionary.is() ? animDictionary.as() : nullptr, animName.is() ? animName.as() : nullptr, p2.is() ? p2.as() : nullptr, &p3, &p4); std::get<1>(return_values) = p3; std::get<2>(return_values) = p4; return return_values; } - static void LUA_NATIVE_ENTITY_SET_ENTITY_ANIM_CURRENT_TIME(Entity entity, const char* animDictionary, const char* animName, float time) + static void LUA_NATIVE_ENTITY_SET_ENTITY_ANIM_CURRENT_TIME(Entity entity, sol::stack_object animDictionary, sol::stack_object animName, float time) { - ENTITY::SET_ENTITY_ANIM_CURRENT_TIME(entity, animDictionary, animName, time); + ENTITY::SET_ENTITY_ANIM_CURRENT_TIME(entity, animDictionary.is() ? animDictionary.as() : nullptr, animName.is() ? animName.as() : nullptr, time); } - static void LUA_NATIVE_ENTITY_SET_ENTITY_ANIM_SPEED(Entity entity, const char* animDictionary, const char* animName, float speedMultiplier) + static void LUA_NATIVE_ENTITY_SET_ENTITY_ANIM_SPEED(Entity entity, sol::stack_object animDictionary, sol::stack_object animName, float speedMultiplier) { - ENTITY::SET_ENTITY_ANIM_SPEED(entity, animDictionary, animName, speedMultiplier); + ENTITY::SET_ENTITY_ANIM_SPEED(entity, animDictionary.is() ? animDictionary.as() : nullptr, animName.is() ? animName.as() : nullptr, speedMultiplier); } static void LUA_NATIVE_ENTITY_SET_ENTITY_AS_MISSION_ENTITY(Entity entity, bool p1, bool p2) @@ -779,9 +779,9 @@ namespace lua::native ENTITY::SET_ENTITY_HEADING(entity, heading); } - static void LUA_NATIVE_ENTITY_SET_ENTITY_HEALTH(Entity entity, int health, int p2, int p3) + static void LUA_NATIVE_ENTITY_SET_ENTITY_HEALTH(Entity entity, int health, Entity instigator, Hash weaponType) { - ENTITY::SET_ENTITY_HEALTH(entity, health, p2, p3); + ENTITY::SET_ENTITY_HEALTH(entity, health, instigator, weaponType); } static void LUA_NATIVE_ENTITY_SET_ENTITY_INVINCIBLE(Entity entity, bool toggle) diff --git a/src/lua/natives/lua_native_binding_GRAPHICS.cpp b/src/lua/natives/lua_native_binding_GRAPHICS.cpp index c59d9844..9a56e0e6 100644 --- a/src/lua/natives/lua_native_binding_GRAPHICS.cpp +++ b/src/lua/natives/lua_native_binding_GRAPHICS.cpp @@ -33,14 +33,14 @@ namespace lua::native GRAPHICS::DRAW_DEBUG_CROSS(x, y, z, size, red, green, blue, alpha); } - static void LUA_NATIVE_GRAPHICS_DRAW_DEBUG_TEXT(const char* text, float x, float y, float z, int red, int green, int blue, int alpha) + static void LUA_NATIVE_GRAPHICS_DRAW_DEBUG_TEXT(sol::stack_object text, float x, float y, float z, int red, int green, int blue, int alpha) { - GRAPHICS::DRAW_DEBUG_TEXT(text, x, y, z, red, green, blue, alpha); + GRAPHICS::DRAW_DEBUG_TEXT(text.is() ? text.as() : nullptr, x, y, z, red, green, blue, alpha); } - static void LUA_NATIVE_GRAPHICS_DRAW_DEBUG_TEXT_2D(const char* text, float x, float y, float z, int red, int green, int blue, int alpha) + static void LUA_NATIVE_GRAPHICS_DRAW_DEBUG_TEXT_2D(sol::stack_object text, float x, float y, float z, int red, int green, int blue, int alpha) { - GRAPHICS::DRAW_DEBUG_TEXT_2D(text, x, y, z, red, green, blue, alpha); + GRAPHICS::DRAW_DEBUG_TEXT_2D(text.is() ? text.as() : nullptr, x, y, z, red, green, blue, alpha); } static void LUA_NATIVE_GRAPHICS_DRAW_LINE(float x1, float y1, float z1, float x2, float y2, float z2, int red, int green, int blue, int alpha) @@ -53,9 +53,9 @@ namespace lua::native GRAPHICS::DRAW_POLY(x1, y1, z1, x2, y2, z2, x3, y3, z3, red, green, blue, alpha); } - static void LUA_NATIVE_GRAPHICS_DRAW_TEXTURED_POLY(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, int red, int green, int blue, int alpha, const char* textureDict, const char* textureName, float u1, float v1, float w1, float u2, float v2, float w2, float u3, float v3, float w3) + static void LUA_NATIVE_GRAPHICS_DRAW_TEXTURED_POLY(float x1, float y1, float z1, float x2, float y2, float z2, float x3, float y3, float z3, int red, int green, int blue, int alpha, sol::stack_object textureDict, sol::stack_object textureName, float u1, float v1, float w1, float u2, float v2, float w2, float u3, float v3, float w3) { - GRAPHICS::DRAW_TEXTURED_POLY(x1, y1, z1, x2, y2, z2, x3, y3, z3, red, green, blue, alpha, textureDict, textureName, u1, v1, w1, u2, v2, w2, u3, v3, w3); + GRAPHICS::DRAW_TEXTURED_POLY(x1, y1, z1, x2, y2, z2, x3, y3, z3, red, green, blue, alpha, textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, u1, v1, w1, u2, v2, w2, u3, v3, w3); } static void LUA_NATIVE_GRAPHICS_DRAW_BOX(float x1, float y1, float z1, float x2, float y2, float z2, int red, int green, int blue, int alpha) @@ -285,14 +285,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_GRAPHICS_DRAW_MARKER(int type, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ, int red, int green, int blue, int alpha, bool bobUpAndDown, bool faceCamera, int p19, bool rotate, const char* textureDict, const char* textureName, bool drawOnEnts) + static void LUA_NATIVE_GRAPHICS_DRAW_MARKER(int type, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ, int red, int green, int blue, int alpha, bool bobUpAndDown, bool faceCamera, int p19, bool rotate, sol::stack_object textureDict, sol::stack_object textureName, bool drawOnEnts) { - GRAPHICS::DRAW_MARKER(type, posX, posY, posZ, dirX, dirY, dirZ, rotX, rotY, rotZ, scaleX, scaleY, scaleZ, red, green, blue, alpha, bobUpAndDown, faceCamera, p19, rotate, textureDict, textureName, drawOnEnts); + GRAPHICS::DRAW_MARKER(type, posX, posY, posZ, dirX, dirY, dirZ, rotX, rotY, rotZ, scaleX, scaleY, scaleZ, red, green, blue, alpha, bobUpAndDown, faceCamera, p19, rotate, textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, drawOnEnts); } - static void LUA_NATIVE_GRAPHICS_DRAW_MARKER_EX(int type, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ, int red, int green, int blue, int alpha, bool bobUpAndDown, bool faceCamera, Any p19, bool rotate, const char* textureDict, const char* textureName, bool drawOnEnts, bool p24, bool p25) + static void LUA_NATIVE_GRAPHICS_DRAW_MARKER_EX(int type, float posX, float posY, float posZ, float dirX, float dirY, float dirZ, float rotX, float rotY, float rotZ, float scaleX, float scaleY, float scaleZ, int red, int green, int blue, int alpha, bool bobUpAndDown, bool faceCamera, Any p19, bool rotate, sol::stack_object textureDict, sol::stack_object textureName, bool drawOnEnts, bool p24, bool p25) { - GRAPHICS::DRAW_MARKER_EX(type, posX, posY, posZ, dirX, dirY, dirZ, rotX, rotY, rotZ, scaleX, scaleY, scaleZ, red, green, blue, alpha, bobUpAndDown, faceCamera, p19, rotate, textureDict, textureName, drawOnEnts, p24, p25); + GRAPHICS::DRAW_MARKER_EX(type, posX, posY, posZ, dirX, dirY, dirZ, rotX, rotY, rotZ, scaleX, scaleY, scaleZ, red, green, blue, alpha, bobUpAndDown, faceCamera, p19, rotate, textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, drawOnEnts, p24, p25); } static void LUA_NATIVE_GRAPHICS_DRAW_MARKER_SPHERE(float x, float y, float z, float radius, int red, int green, int blue, float alpha) @@ -371,20 +371,20 @@ namespace lua::native GRAPHICS::FORCE_RENDER_IN_GAME_UI(toggle); } - static void LUA_NATIVE_GRAPHICS_REQUEST_STREAMED_TEXTURE_DICT(const char* textureDict, bool p1) + static void LUA_NATIVE_GRAPHICS_REQUEST_STREAMED_TEXTURE_DICT(sol::stack_object textureDict, bool p1) { - GRAPHICS::REQUEST_STREAMED_TEXTURE_DICT(textureDict, p1); + GRAPHICS::REQUEST_STREAMED_TEXTURE_DICT(textureDict.is() ? textureDict.as() : nullptr, p1); } - static bool LUA_NATIVE_GRAPHICS_HAS_STREAMED_TEXTURE_DICT_LOADED(const char* textureDict) + static bool LUA_NATIVE_GRAPHICS_HAS_STREAMED_TEXTURE_DICT_LOADED(sol::stack_object textureDict) { - auto retval = (bool)GRAPHICS::HAS_STREAMED_TEXTURE_DICT_LOADED(textureDict); + auto retval = (bool)GRAPHICS::HAS_STREAMED_TEXTURE_DICT_LOADED(textureDict.is() ? textureDict.as() : nullptr); return retval; } - static void LUA_NATIVE_GRAPHICS_SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED(const char* textureDict) + static void LUA_NATIVE_GRAPHICS_SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED(sol::stack_object textureDict) { - GRAPHICS::SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED(textureDict); + GRAPHICS::SET_STREAMED_TEXTURE_DICT_AS_NO_LONGER_NEEDED(textureDict.is() ? textureDict.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_DRAW_RECT(float x, float y, float width, float height, int r, int g, int b, int a, bool p8) @@ -433,29 +433,29 @@ namespace lua::native return retval; } - static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE(const char* textureDict, const char* textureName, float screenX, float screenY, float width, float height, float heading, int red, int green, int blue, int alpha, bool p11, Any p12) + static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE(sol::stack_object textureDict, sol::stack_object textureName, float screenX, float screenY, float width, float height, float heading, int red, int green, int blue, int alpha, bool p11, Any p12) { - GRAPHICS::DRAW_SPRITE(textureDict, textureName, screenX, screenY, width, height, heading, red, green, blue, alpha, p11, p12); + GRAPHICS::DRAW_SPRITE(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, screenX, screenY, width, height, heading, red, green, blue, alpha, p11, p12); } - static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_ARX(const char* textureDict, const char* textureName, float x, float y, float width, float height, float p6, int red, int green, int blue, int alpha, Any p11, Any p12) + static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_ARX(sol::stack_object textureDict, sol::stack_object textureName, float x, float y, float width, float height, float p6, int red, int green, int blue, int alpha, Any p11, Any p12) { - GRAPHICS::DRAW_SPRITE_ARX(textureDict, textureName, x, y, width, height, p6, red, green, blue, alpha, p11, p12); + GRAPHICS::DRAW_SPRITE_ARX(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, x, y, width, height, p6, red, green, blue, alpha, p11, p12); } - static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_NAMED_RENDERTARGET(const char* textureDict, const char* textureName, float screenX, float screenY, float width, float height, float heading, int red, int green, int blue, int alpha, Any p11) + static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_NAMED_RENDERTARGET(sol::stack_object textureDict, sol::stack_object textureName, float screenX, float screenY, float width, float height, float heading, int red, int green, int blue, int alpha, Any p11) { - GRAPHICS::DRAW_SPRITE_NAMED_RENDERTARGET(textureDict, textureName, screenX, screenY, width, height, heading, red, green, blue, alpha, p11); + GRAPHICS::DRAW_SPRITE_NAMED_RENDERTARGET(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, screenX, screenY, width, height, heading, red, green, blue, alpha, p11); } - static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_ARX_WITH_UV(const char* textureDict, const char* textureName, float x, float y, float width, float height, float u1, float v1, float u2, float v2, float heading, int red, int green, int blue, int alpha, Any p15) + static void LUA_NATIVE_GRAPHICS_DRAW_SPRITE_ARX_WITH_UV(sol::stack_object textureDict, sol::stack_object textureName, float x, float y, float width, float height, float u1, float v1, float u2, float v2, float heading, int red, int green, int blue, int alpha, Any p15) { - GRAPHICS::DRAW_SPRITE_ARX_WITH_UV(textureDict, textureName, x, y, width, height, u1, v1, u2, v2, heading, red, green, blue, alpha, p15); + GRAPHICS::DRAW_SPRITE_ARX_WITH_UV(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, x, y, width, height, u1, v1, u2, v2, heading, red, green, blue, alpha, p15); } - static int LUA_NATIVE_GRAPHICS_ADD_ENTITY_ICON(Entity entity, const char* icon) + static int LUA_NATIVE_GRAPHICS_ADD_ENTITY_ICON(Entity entity, sol::stack_object icon) { - auto retval = GRAPHICS::ADD_ENTITY_ICON(entity, icon); + auto retval = GRAPHICS::ADD_ENTITY_ICON(entity, icon.is() ? icon.as() : nullptr); return retval; } @@ -479,9 +479,9 @@ namespace lua::native GRAPHICS::CLEAR_DRAW_ORIGIN(); } - static int LUA_NATIVE_GRAPHICS_SET_BINK_MOVIE(const char* name) + static int LUA_NATIVE_GRAPHICS_SET_BINK_MOVIE(sol::stack_object name) { - auto retval = GRAPHICS::SET_BINK_MOVIE(name); + auto retval = GRAPHICS::SET_BINK_MOVIE(name.is() ? name.as() : nullptr); return retval; } @@ -541,9 +541,9 @@ namespace lua::native GRAPHICS::SET_BINK_SHOULD_SKIP(binkMovie, bShouldSkip); } - static int LUA_NATIVE_GRAPHICS_LOAD_MOVIE_MESH_SET(const char* movieMeshSetName) + static int LUA_NATIVE_GRAPHICS_LOAD_MOVIE_MESH_SET(sol::stack_object movieMeshSetName) { - auto retval = GRAPHICS::LOAD_MOVIE_MESH_SET(movieMeshSetName); + auto retval = GRAPHICS::LOAD_MOVIE_MESH_SET(movieMeshSetName.is() ? movieMeshSetName.as() : nullptr); return retval; } @@ -659,15 +659,15 @@ namespace lua::native return return_values; } - static Vector3 LUA_NATIVE_GRAPHICS_GET_TEXTURE_RESOLUTION(const char* textureDict, const char* textureName) + static Vector3 LUA_NATIVE_GRAPHICS_GET_TEXTURE_RESOLUTION(sol::stack_object textureDict, sol::stack_object textureName) { - auto retval = GRAPHICS::GET_TEXTURE_RESOLUTION(textureDict, textureName); + auto retval = GRAPHICS::GET_TEXTURE_RESOLUTION(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_OVERRIDE_PED_CREW_LOGO_TEXTURE(Ped ped, const char* txd, const char* txn) + static bool LUA_NATIVE_GRAPHICS_OVERRIDE_PED_CREW_LOGO_TEXTURE(Ped ped, sol::stack_object txd, sol::stack_object txn) { - auto retval = (bool)GRAPHICS::OVERRIDE_PED_CREW_LOGO_TEXTURE(ped, txd, txn); + auto retval = (bool)GRAPHICS::OVERRIDE_PED_CREW_LOGO_TEXTURE(ped, txd.is() ? txd.as() : nullptr, txn.is() ? txn.as() : nullptr); return retval; } @@ -825,9 +825,9 @@ namespace lua::native GRAPHICS::CASCADE_SHADOWS_SET_SCREEN_SIZE_CHECK_ENABLED(p0); } - static void LUA_NATIVE_GRAPHICS_CASCADE_SHADOWS_SET_SHADOW_SAMPLE_TYPE(const char* type) + static void LUA_NATIVE_GRAPHICS_CASCADE_SHADOWS_SET_SHADOW_SAMPLE_TYPE(sol::stack_object type) { - GRAPHICS::CASCADE_SHADOWS_SET_SHADOW_SAMPLE_TYPE(type); + GRAPHICS::CASCADE_SHADOWS_SET_SHADOW_SAMPLE_TYPE(type.is() ? type.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_CASCADE_SHADOWS_CLEAR_SHADOW_SAMPLE_TYPE() @@ -1082,51 +1082,51 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_GRAPHICS_PHONEPHOTOEDITOR_SET_FRAME_TXD(const char* textureDict, bool p1) + static bool LUA_NATIVE_GRAPHICS_PHONEPHOTOEDITOR_SET_FRAME_TXD(sol::stack_object textureDict, bool p1) { - auto retval = (bool)GRAPHICS::PHONEPHOTOEDITOR_SET_FRAME_TXD(textureDict, p1); + auto retval = (bool)GRAPHICS::PHONEPHOTOEDITOR_SET_FRAME_TXD(textureDict.is() ? textureDict.as() : nullptr, p1); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_AT_COORD(const char* effectName, float xPos, float yPos, float zPos, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis) + static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_AT_COORD(sol::stack_object effectName, float xPos, float yPos, float zPos, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis) { - auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_AT_COORD(effectName, xPos, yPos, zPos, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis); + auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_AT_COORD(effectName.is() ? effectName.as() : nullptr, xPos, yPos, zPos, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_AT_COORD(const char* effectName, float xPos, float yPos, float zPos, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, bool p11) + static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_AT_COORD(sol::stack_object effectName, float xPos, float yPos, float zPos, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, bool p11) { - auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_AT_COORD(effectName, xPos, yPos, zPos, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, p11); + auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_AT_COORD(effectName.is() ? effectName.as() : nullptr, xPos, yPos, zPos, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, p11); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(const char* effectName, Ped ped, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) + static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(sol::stack_object effectName, Ped ped, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) { - auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(effectName, ped, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); + auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(effectName.is() ? effectName.as() : nullptr, ped, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(const char* effectName, Ped ped, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) + static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(sol::stack_object effectName, Ped ped, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) { - auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(effectName, ped, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); + auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_PED_BONE(effectName.is() ? effectName.as() : nullptr, ped, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_ENTITY(const char* effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, float scale, bool axisX, bool axisY, bool axisZ) + static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_ENTITY(sol::stack_object effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, float scale, bool axisX, bool axisY, bool axisZ) { - auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_ENTITY(effectName, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, scale, axisX, axisY, axisZ); + auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_ENTITY(effectName.is() ? effectName.as() : nullptr, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, scale, axisX, axisY, axisZ); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_ENTITY(const char* effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, float scale, bool axisX, bool axisY, bool axisZ) + static bool LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_ENTITY(sol::stack_object effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, float scale, bool axisX, bool axisY, bool axisZ) { - auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_ENTITY(effectName, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, scale, axisX, axisY, axisZ); + auto retval = (bool)GRAPHICS::START_NETWORKED_PARTICLE_FX_NON_LOOPED_ON_ENTITY(effectName.is() ? effectName.as() : nullptr, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, scale, axisX, axisY, axisZ); return retval; } - static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_ENTITY_BONE(const char* effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) + static bool LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_NON_LOOPED_ON_ENTITY_BONE(sol::stack_object effectName, Entity entity, float offsetX, float offsetY, float offsetZ, float rotX, float rotY, float rotZ, int boneIndex, float scale, bool axisX, bool axisY, bool axisZ) { - auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_ENTITY_BONE(effectName, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); + auto retval = (bool)GRAPHICS::START_PARTICLE_FX_NON_LOOPED_ON_ENTITY_BONE(effectName.is() ? effectName.as() : nullptr, entity, offsetX, offsetY, offsetZ, rotX, rotY, rotZ, boneIndex, scale, axisX, axisY, axisZ); return retval; } @@ -1155,39 +1155,39 @@ namespace lua::native GRAPHICS::SET_PARTICLE_FX_FORCE_VEHICLE_INTERIOR(toggle); } - static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_AT_COORD(const char* effectName, float x, float y, float z, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, bool p11) + static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_AT_COORD(sol::stack_object effectName, float x, float y, float z, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, bool p11) { - auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_AT_COORD(effectName, x, y, z, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, p11); + auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_AT_COORD(effectName.is() ? effectName.as() : nullptr, x, y, z, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, p11); return retval; } - static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_PED_BONE(const char* effectName, Ped ped, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis) + static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_PED_BONE(sol::stack_object effectName, Ped ped, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis) { - auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_PED_BONE(effectName, ped, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis); + auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_PED_BONE(effectName.is() ? effectName.as() : nullptr, ped, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis); return retval; } - static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_ENTITY(const char* effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis) + static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_ENTITY(sol::stack_object effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis) { - auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_ENTITY(effectName, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis); + auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_ENTITY(effectName.is() ? effectName.as() : nullptr, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis); return retval; } - static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(const char* effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis) + static int LUA_NATIVE_GRAPHICS_START_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(sol::stack_object effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis) { - auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(effectName, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis); + auto retval = GRAPHICS::START_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(effectName.is() ? effectName.as() : nullptr, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis); return retval; } - static int LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY(const char* effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, float r, float g, float b, float a) + static int LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY(sol::stack_object effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, float scale, bool xAxis, bool yAxis, bool zAxis, float r, float g, float b, float a) { - auto retval = GRAPHICS::START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY(effectName, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, r, g, b, a); + auto retval = GRAPHICS::START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY(effectName.is() ? effectName.as() : nullptr, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, scale, xAxis, yAxis, zAxis, r, g, b, a); return retval; } - static int LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(const char* effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis, float r, float g, float b, float a) + static int LUA_NATIVE_GRAPHICS_START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(sol::stack_object effectName, Entity entity, float xOffset, float yOffset, float zOffset, float xRot, float yRot, float zRot, int boneIndex, float scale, bool xAxis, bool yAxis, bool zAxis, float r, float g, float b, float a) { - auto retval = GRAPHICS::START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(effectName, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis, r, g, b, a); + auto retval = GRAPHICS::START_NETWORKED_PARTICLE_FX_LOOPED_ON_ENTITY_BONE(effectName.is() ? effectName.as() : nullptr, entity, xOffset, yOffset, zOffset, xRot, yRot, zRot, boneIndex, scale, xAxis, yAxis, zAxis, r, g, b, a); return retval; } @@ -1227,9 +1227,9 @@ namespace lua::native GRAPHICS::SET_PARTICLE_FX_LOOPED_OFFSETS(ptfxHandle, x, y, z, rotX, rotY, rotZ); } - static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_EVOLUTION(int ptfxHandle, const char* propertyName, float amount, bool noNetwork) + static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_EVOLUTION(int ptfxHandle, sol::stack_object propertyName, float amount, bool noNetwork) { - GRAPHICS::SET_PARTICLE_FX_LOOPED_EVOLUTION(ptfxHandle, propertyName, amount, noNetwork); + GRAPHICS::SET_PARTICLE_FX_LOOPED_EVOLUTION(ptfxHandle, propertyName.is() ? propertyName.as() : nullptr, amount, noNetwork); } static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_COLOUR(int ptfxHandle, float r, float g, float b, bool p4) @@ -1252,6 +1252,11 @@ namespace lua::native GRAPHICS::SET_PARTICLE_FX_LOOPED_FAR_CLIP_DIST(ptfxHandle, range); } + static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_CAMERA_BIAS_(int ptfxHandle, float p1) + { + GRAPHICS::_SET_PARTICLE_FX_LOOPED_CAMERA_BIAS(ptfxHandle, p1); + } + static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_CAM_INSIDE_VEHICLE(bool p0) { GRAPHICS::SET_PARTICLE_FX_CAM_INSIDE_VEHICLE(p0); @@ -1327,9 +1332,9 @@ namespace lua::native GRAPHICS::SET_PARTICLE_FX_FOOT_LODRANGE_SCALE(p0); } - static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_FOOT_OVERRIDE_NAME(const char* p0) + static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_FOOT_OVERRIDE_NAME(sol::stack_object p0) { - GRAPHICS::SET_PARTICLE_FX_FOOT_OVERRIDE_NAME(p0); + GRAPHICS::SET_PARTICLE_FX_FOOT_OVERRIDE_NAME(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_SET_SKIDMARK_RANGE_SCALE(float scale) @@ -1352,19 +1357,25 @@ namespace lua::native GRAPHICS::FORCE_POSTFX_BULLET_IMPACTS_AFTER_HUD(p0); } - static void LUA_NATIVE_GRAPHICS_USE_PARTICLE_FX_ASSET(const char* name) + static void LUA_NATIVE_GRAPHICS_USE_PARTICLE_FX_ASSET(sol::stack_object name) { - GRAPHICS::USE_PARTICLE_FX_ASSET(name); + GRAPHICS::USE_PARTICLE_FX_ASSET(name.is() ? name.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_OVERRIDE(const char* oldAsset, const char* newAsset) + static void LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_OVERRIDE(sol::stack_object oldAsset, sol::stack_object newAsset) { - GRAPHICS::SET_PARTICLE_FX_OVERRIDE(oldAsset, newAsset); + GRAPHICS::SET_PARTICLE_FX_OVERRIDE(oldAsset.is() ? oldAsset.as() : nullptr, newAsset.is() ? newAsset.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_RESET_PARTICLE_FX_OVERRIDE(const char* name) + static void LUA_NATIVE_GRAPHICS_RESET_PARTICLE_FX_OVERRIDE(sol::stack_object name) { - GRAPHICS::RESET_PARTICLE_FX_OVERRIDE(name); + GRAPHICS::RESET_PARTICLE_FX_OVERRIDE(name.is() ? name.as() : nullptr); + } + + static int LUA_NATIVE_GRAPHICS_START_VEHICLE_PARTICLE_FX_LOOPED_(Vehicle vehicle, sol::stack_object effectName, bool frontBack, bool leftRight, bool localOnly) + { + auto retval = GRAPHICS::_START_VEHICLE_PARTICLE_FX_LOOPED(vehicle, effectName.is() ? effectName.as() : nullptr, frontBack, leftRight, localOnly); + return retval; } static void LUA_NATIVE_GRAPHICS_SET_WEATHER_PTFX_USE_OVERRIDE_SETTINGS(bool p0) @@ -1483,9 +1494,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_GRAPHICS_PATCH_DECAL_DIFFUSE_MAP(int decalType, const char* textureDict, const char* textureName) + static void LUA_NATIVE_GRAPHICS_PATCH_DECAL_DIFFUSE_MAP(int decalType, sol::stack_object textureDict, sol::stack_object textureName) { - GRAPHICS::PATCH_DECAL_DIFFUSE_MAP(decalType, textureDict, textureName); + GRAPHICS::PATCH_DECAL_DIFFUSE_MAP(decalType, textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_UNPATCH_DECAL_DIFFUSE_MAP(int decalType) @@ -1545,9 +1556,9 @@ namespace lua::native GRAPHICS::SET_DECAL_BULLET_IMPACT_RANGE_SCALE(p0); } - static void LUA_NATIVE_GRAPHICS_OVERRIDE_INTERIOR_SMOKE_NAME(const char* name) + static void LUA_NATIVE_GRAPHICS_OVERRIDE_INTERIOR_SMOKE_NAME(sol::stack_object name) { - GRAPHICS::OVERRIDE_INTERIOR_SMOKE_NAME(name); + GRAPHICS::OVERRIDE_INTERIOR_SMOKE_NAME(name.is() ? name.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_OVERRIDE_INTERIOR_SMOKE_LEVEL(float level) @@ -1585,6 +1596,11 @@ namespace lua::native GRAPHICS::USE_SNOW_FOOT_VFX_WHEN_UNSHELTERED(toggle); } + static void LUA_NATIVE_GRAPHICS_FORCE_ALLOW_SNOW_FOOT_VFX_ON_ICE_(bool toggle) + { + GRAPHICS::_FORCE_ALLOW_SNOW_FOOT_VFX_ON_ICE(toggle); + } + static void LUA_NATIVE_GRAPHICS_USE_SNOW_WHEEL_VFX_WHEN_UNSHELTERED(bool toggle) { GRAPHICS::USE_SNOW_WHEEL_VFX_WHEN_UNSHELTERED(toggle); @@ -1595,14 +1611,19 @@ namespace lua::native GRAPHICS::DISABLE_REGION_VFX(p0); } - static void LUA_NATIVE_GRAPHICS_PRESET_INTERIOR_AMBIENT_CACHE(const char* timecycleModifierName) + static void LUA_NATIVE_GRAPHICS_FORCE_GROUND_SNOW_PASS_(bool toggle) { - GRAPHICS::PRESET_INTERIOR_AMBIENT_CACHE(timecycleModifierName); + GRAPHICS::_FORCE_GROUND_SNOW_PASS(toggle); } - static void LUA_NATIVE_GRAPHICS_SET_TIMECYCLE_MODIFIER(const char* modifierName) + static void LUA_NATIVE_GRAPHICS_PRESET_INTERIOR_AMBIENT_CACHE(sol::stack_object timecycleModifierName) { - GRAPHICS::SET_TIMECYCLE_MODIFIER(modifierName); + GRAPHICS::PRESET_INTERIOR_AMBIENT_CACHE(timecycleModifierName.is() ? timecycleModifierName.as() : nullptr); + } + + static void LUA_NATIVE_GRAPHICS_SET_TIMECYCLE_MODIFIER(sol::stack_object modifierName) + { + GRAPHICS::SET_TIMECYCLE_MODIFIER(modifierName.is() ? modifierName.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_SET_TIMECYCLE_MODIFIER_STRENGTH(float strength) @@ -1610,9 +1631,9 @@ namespace lua::native GRAPHICS::SET_TIMECYCLE_MODIFIER_STRENGTH(strength); } - static void LUA_NATIVE_GRAPHICS_SET_TRANSITION_TIMECYCLE_MODIFIER(const char* modifierName, float transition) + static void LUA_NATIVE_GRAPHICS_SET_TRANSITION_TIMECYCLE_MODIFIER(sol::stack_object modifierName, float transition) { - GRAPHICS::SET_TRANSITION_TIMECYCLE_MODIFIER(modifierName, transition); + GRAPHICS::SET_TRANSITION_TIMECYCLE_MODIFIER(modifierName.is() ? modifierName.as() : nullptr, transition); } static void LUA_NATIVE_GRAPHICS_SET_TRANSITION_OUT_OF_TIMECYCLE_MODIFIER(float strength) @@ -1653,9 +1674,9 @@ namespace lua::native GRAPHICS::POP_TIMECYCLE_MODIFIER(); } - static void LUA_NATIVE_GRAPHICS_SET_CURRENT_PLAYER_TCMODIFIER(const char* modifierName) + static void LUA_NATIVE_GRAPHICS_SET_CURRENT_PLAYER_TCMODIFIER(sol::stack_object modifierName) { - GRAPHICS::SET_CURRENT_PLAYER_TCMODIFIER(modifierName); + GRAPHICS::SET_CURRENT_PLAYER_TCMODIFIER(modifierName.is() ? modifierName.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_SET_PLAYER_TCMODIFIER_TRANSITION(float value) @@ -1663,24 +1684,24 @@ namespace lua::native GRAPHICS::SET_PLAYER_TCMODIFIER_TRANSITION(value); } - static void LUA_NATIVE_GRAPHICS_SET_NEXT_PLAYER_TCMODIFIER(const char* modifierName) + static void LUA_NATIVE_GRAPHICS_SET_NEXT_PLAYER_TCMODIFIER(sol::stack_object modifierName) { - GRAPHICS::SET_NEXT_PLAYER_TCMODIFIER(modifierName); + GRAPHICS::SET_NEXT_PLAYER_TCMODIFIER(modifierName.is() ? modifierName.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_ADD_TCMODIFIER_OVERRIDE(const char* modifierName1, const char* modifierName2) + static void LUA_NATIVE_GRAPHICS_ADD_TCMODIFIER_OVERRIDE(sol::stack_object modifierName1, sol::stack_object modifierName2) { - GRAPHICS::ADD_TCMODIFIER_OVERRIDE(modifierName1, modifierName2); + GRAPHICS::ADD_TCMODIFIER_OVERRIDE(modifierName1.is() ? modifierName1.as() : nullptr, modifierName2.is() ? modifierName2.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_CLEAR_ALL_TCMODIFIER_OVERRIDES(const char* p0) + static void LUA_NATIVE_GRAPHICS_CLEAR_ALL_TCMODIFIER_OVERRIDES(sol::stack_object p0) { - GRAPHICS::CLEAR_ALL_TCMODIFIER_OVERRIDES(p0); + GRAPHICS::CLEAR_ALL_TCMODIFIER_OVERRIDES(p0.is() ? p0.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_SET_EXTRA_TCMODIFIER(const char* modifierName) + static void LUA_NATIVE_GRAPHICS_SET_EXTRA_TCMODIFIER(sol::stack_object modifierName) { - GRAPHICS::SET_EXTRA_TCMODIFIER(modifierName); + GRAPHICS::SET_EXTRA_TCMODIFIER(modifierName.is() ? modifierName.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_CLEAR_EXTRA_TCMODIFIER() @@ -1704,27 +1725,27 @@ namespace lua::native GRAPHICS::DISABLE_MOON_CYCLE_OVERRIDE(); } - static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE(const char* scaleformName) + static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE(sol::stack_object scaleformName) { - auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE(scaleformName); + auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE(scaleformName.is() ? scaleformName.as() : nullptr); return retval; } - static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_WITH_IGNORE_SUPER_WIDESCREEN(const char* scaleformName) + static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_WITH_IGNORE_SUPER_WIDESCREEN(sol::stack_object scaleformName) { - auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_WITH_IGNORE_SUPER_WIDESCREEN(scaleformName); + auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_WITH_IGNORE_SUPER_WIDESCREEN(scaleformName.is() ? scaleformName.as() : nullptr); return retval; } - static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_INSTANCE(const char* scaleformName) + static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_INSTANCE(sol::stack_object scaleformName) { - auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_INSTANCE(scaleformName); + auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_INSTANCE(scaleformName.is() ? scaleformName.as() : nullptr); return retval; } - static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_SKIP_RENDER_WHILE_PAUSED(const char* scaleformName) + static int LUA_NATIVE_GRAPHICS_REQUEST_SCALEFORM_MOVIE_SKIP_RENDER_WHILE_PAUSED(sol::stack_object scaleformName) { - auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_SKIP_RENDER_WHILE_PAUSED(scaleformName); + auto retval = GRAPHICS::REQUEST_SCALEFORM_MOVIE_SKIP_RENDER_WHILE_PAUSED(scaleformName.is() ? scaleformName.as() : nullptr); return retval; } @@ -1746,9 +1767,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_GRAPHICS_HAS_SCALEFORM_MOVIE_FILENAME_LOADED(const char* scaleformName) + static bool LUA_NATIVE_GRAPHICS_HAS_SCALEFORM_MOVIE_FILENAME_LOADED(sol::stack_object scaleformName) { - auto retval = (bool)GRAPHICS::HAS_SCALEFORM_MOVIE_FILENAME_LOADED(scaleformName); + auto retval = (bool)GRAPHICS::HAS_SCALEFORM_MOVIE_FILENAME_LOADED(scaleformName.is() ? scaleformName.as() : nullptr); return retval; } @@ -1804,47 +1825,47 @@ namespace lua::native GRAPHICS::DRAW_SCALEFORM_MOVIE_3D_SOLID(scaleform, posX, posY, posZ, rotX, rotY, rotZ, p7, p8, p9, scaleX, scaleY, scaleZ, rotationOrder); } - static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD(int scaleform, const char* method) + static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD(int scaleform, sol::stack_object method) { - GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD(scaleform, method); + GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD(scaleform, method.is() ? method.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER(int scaleform, const char* methodName, float param1, float param2, float param3, float param4, float param5) + static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER(int scaleform, sol::stack_object methodName, float param1, float param2, float param3, float param4, float param5) { - GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER(scaleform, methodName, param1, param2, param3, param4, param5); + GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER(scaleform, methodName.is() ? methodName.as() : nullptr, param1, param2, param3, param4, param5); } - static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_STRING(int scaleform, const char* methodName, const char* param1, const char* param2, const char* param3, const char* param4, const char* param5) + static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_STRING(int scaleform, sol::stack_object methodName, sol::stack_object param1, sol::stack_object param2, sol::stack_object param3, sol::stack_object param4, sol::stack_object param5) { - GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_STRING(scaleform, methodName, param1, param2, param3, param4, param5); + GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_STRING(scaleform, methodName.is() ? methodName.as() : nullptr, param1.is() ? param1.as() : nullptr, param2.is() ? param2.as() : nullptr, param3.is() ? param3.as() : nullptr, param4.is() ? param4.as() : nullptr, param5.is() ? param5.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER_AND_STRING(int scaleform, const char* methodName, float floatParam1, float floatParam2, float floatParam3, float floatParam4, float floatParam5, const char* stringParam1, const char* stringParam2, const char* stringParam3, const char* stringParam4, const char* stringParam5) + static void LUA_NATIVE_GRAPHICS_CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER_AND_STRING(int scaleform, sol::stack_object methodName, float floatParam1, float floatParam2, float floatParam3, float floatParam4, float floatParam5, sol::stack_object stringParam1, sol::stack_object stringParam2, sol::stack_object stringParam3, sol::stack_object stringParam4, sol::stack_object stringParam5) { - GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER_AND_STRING(scaleform, methodName, floatParam1, floatParam2, floatParam3, floatParam4, floatParam5, stringParam1, stringParam2, stringParam3, stringParam4, stringParam5); + GRAPHICS::CALL_SCALEFORM_MOVIE_METHOD_WITH_NUMBER_AND_STRING(scaleform, methodName.is() ? methodName.as() : nullptr, floatParam1, floatParam2, floatParam3, floatParam4, floatParam5, stringParam1.is() ? stringParam1.as() : nullptr, stringParam2.is() ? stringParam2.as() : nullptr, stringParam3.is() ? stringParam3.as() : nullptr, stringParam4.is() ? stringParam4.as() : nullptr, stringParam5.is() ? stringParam5.as() : nullptr); } - static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_SCRIPT_HUD_MOVIE_METHOD(int hudComponent, const char* methodName) + static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_SCRIPT_HUD_MOVIE_METHOD(int hudComponent, sol::stack_object methodName) { - auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_SCRIPT_HUD_MOVIE_METHOD(hudComponent, methodName); + auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_SCRIPT_HUD_MOVIE_METHOD(hudComponent, methodName.is() ? methodName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD(int scaleform, const char* methodName) + static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD(int scaleform, sol::stack_object methodName) { - auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD(scaleform, methodName); + auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD(scaleform, methodName.is() ? methodName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND(const char* methodName) + static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND(sol::stack_object methodName) { - auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND(methodName); + auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND(methodName.is() ? methodName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND_HEADER(const char* methodName) + static bool LUA_NATIVE_GRAPHICS_BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND_HEADER(sol::stack_object methodName) { - auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND_HEADER(methodName); + auto retval = (bool)GRAPHICS::BEGIN_SCALEFORM_MOVIE_METHOD_ON_FRONTEND_HEADER(methodName.is() ? methodName.as() : nullptr); return retval; } @@ -1898,9 +1919,9 @@ namespace lua::native GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_BOOL(value); } - static void LUA_NATIVE_GRAPHICS_BEGIN_TEXT_COMMAND_SCALEFORM_STRING(const char* componentType) + static void LUA_NATIVE_GRAPHICS_BEGIN_TEXT_COMMAND_SCALEFORM_STRING(sol::stack_object componentType) { - GRAPHICS::BEGIN_TEXT_COMMAND_SCALEFORM_STRING(componentType); + GRAPHICS::BEGIN_TEXT_COMMAND_SCALEFORM_STRING(componentType.is() ? componentType.as() : nullptr); } static void LUA_NATIVE_GRAPHICS_END_TEXT_COMMAND_SCALEFORM_STRING() @@ -1913,19 +1934,19 @@ namespace lua::native GRAPHICS::END_TEXT_COMMAND_UNPARSED_SCALEFORM_STRING(); } - static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_LITERAL_STRING(const char* string) + static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_LITERAL_STRING(sol::stack_object string) { - GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_LITERAL_STRING(string); + GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_LITERAL_STRING(string.is() ? string.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_TEXTURE_NAME_STRING(const char* string) + static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_TEXTURE_NAME_STRING(sol::stack_object string) { - GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_TEXTURE_NAME_STRING(string); + GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_TEXTURE_NAME_STRING(string.is() ? string.as() : nullptr); } - static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_PLAYER_NAME_STRING(const char* string) + static void LUA_NATIVE_GRAPHICS_SCALEFORM_MOVIE_METHOD_ADD_PARAM_PLAYER_NAME_STRING(sol::stack_object string) { - GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_PLAYER_NAME_STRING(string); + GRAPHICS::SCALEFORM_MOVIE_METHOD_ADD_PARAM_PLAYER_NAME_STRING(string.is() ? string.as() : nullptr); } static bool LUA_NATIVE_GRAPHICS_DOES_LATEST_BRIEF_STRING_EXIST(int p0) @@ -1988,14 +2009,19 @@ namespace lua::native GRAPHICS::DRAW_TV_CHANNEL(xPos, yPos, xScale, yScale, rotation, red, green, blue, alpha); } - static void LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST(int tvChannel, const char* playlistName, bool restart) + static void LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST(int tvChannel, sol::stack_object playlistName, bool restart) { - GRAPHICS::SET_TV_CHANNEL_PLAYLIST(tvChannel, playlistName, restart); + GRAPHICS::SET_TV_CHANNEL_PLAYLIST(tvChannel, playlistName.is() ? playlistName.as() : nullptr, restart); } - static void LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST_AT_HOUR(int tvChannel, const char* playlistName, int hour) + static void LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST_AT_HOUR(int tvChannel, sol::stack_object playlistName, int hour) { - GRAPHICS::SET_TV_CHANNEL_PLAYLIST_AT_HOUR(tvChannel, playlistName, hour); + GRAPHICS::SET_TV_CHANNEL_PLAYLIST_AT_HOUR(tvChannel, playlistName.is() ? playlistName.as() : nullptr, hour); + } + + static void LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST_DIRTY_(int tvChannel, bool p1) + { + GRAPHICS::_SET_TV_CHANNEL_PLAYLIST_DIRTY(tvChannel, p1); } static void LUA_NATIVE_GRAPHICS_CLEAR_TV_CHANNEL_PLAYLIST(int tvChannel) @@ -2042,15 +2068,15 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_GRAPHICS_UI3DSCENE_PUSH_PRESET(const char* presetName) + static bool LUA_NATIVE_GRAPHICS_UI3DSCENE_PUSH_PRESET(sol::stack_object presetName) { - auto retval = (bool)GRAPHICS::UI3DSCENE_PUSH_PRESET(presetName); + auto retval = (bool)GRAPHICS::UI3DSCENE_PUSH_PRESET(presetName.is() ? presetName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_UI3DSCENE_ASSIGN_PED_TO_SLOT(const char* presetName, Ped ped, int slot, float posX, float posY, float posZ) + static bool LUA_NATIVE_GRAPHICS_UI3DSCENE_ASSIGN_PED_TO_SLOT(sol::stack_object presetName, Ped ped, int slot, float posX, float posY, float posZ) { - auto retval = (bool)GRAPHICS::UI3DSCENE_ASSIGN_PED_TO_SLOT(presetName, ped, slot, posX, posY, posZ); + auto retval = (bool)GRAPHICS::UI3DSCENE_ASSIGN_PED_TO_SLOT(presetName.is() ? presetName.as() : nullptr, ped, slot, posX, posY, posZ); return retval; } @@ -2079,25 +2105,25 @@ namespace lua::native GRAPHICS::TERRAINGRID_SET_COLOURS(lowR, lowG, lowB, lowAlpha, r, g, b, alpha, highR, highG, highB, highAlpha); } - static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_PLAY(const char* effectName, int duration, bool looped) + static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_PLAY(sol::stack_object effectName, int duration, bool looped) { - GRAPHICS::ANIMPOSTFX_PLAY(effectName, duration, looped); + GRAPHICS::ANIMPOSTFX_PLAY(effectName.is() ? effectName.as() : nullptr, duration, looped); } - static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_STOP(const char* effectName) + static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_STOP(sol::stack_object effectName) { - GRAPHICS::ANIMPOSTFX_STOP(effectName); + GRAPHICS::ANIMPOSTFX_STOP(effectName.is() ? effectName.as() : nullptr); } - static float LUA_NATIVE_GRAPHICS_ANIMPOSTFX_GET_CURRENT_TIME(const char* effectName) + static float LUA_NATIVE_GRAPHICS_ANIMPOSTFX_GET_CURRENT_TIME(sol::stack_object effectName) { - auto retval = GRAPHICS::ANIMPOSTFX_GET_CURRENT_TIME(effectName); + auto retval = GRAPHICS::ANIMPOSTFX_GET_CURRENT_TIME(effectName.is() ? effectName.as() : nullptr); return retval; } - static bool LUA_NATIVE_GRAPHICS_ANIMPOSTFX_IS_RUNNING(const char* effectName) + static bool LUA_NATIVE_GRAPHICS_ANIMPOSTFX_IS_RUNNING(sol::stack_object effectName) { - auto retval = (bool)GRAPHICS::ANIMPOSTFX_IS_RUNNING(effectName); + auto retval = (bool)GRAPHICS::ANIMPOSTFX_IS_RUNNING(effectName.is() ? effectName.as() : nullptr); return retval; } @@ -2106,9 +2132,9 @@ namespace lua::native GRAPHICS::ANIMPOSTFX_STOP_ALL(); } - static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_STOP_AND_FLUSH_REQUESTS(const char* effectName) + static void LUA_NATIVE_GRAPHICS_ANIMPOSTFX_STOP_AND_FLUSH_REQUESTS(sol::stack_object effectName) { - GRAPHICS::ANIMPOSTFX_STOP_AND_FLUSH_REQUESTS(effectName); + GRAPHICS::ANIMPOSTFX_STOP_AND_FLUSH_REQUESTS(effectName.is() ? effectName.as() : nullptr); } void init_native_binding_GRAPHICS(sol::state& L) @@ -2345,6 +2371,7 @@ namespace lua::native GRAPHICS.set_function("SET_PARTICLE_FX_LOOPED_ALPHA", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_ALPHA); GRAPHICS.set_function("SET_PARTICLE_FX_LOOPED_SCALE", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_SCALE); GRAPHICS.set_function("SET_PARTICLE_FX_LOOPED_FAR_CLIP_DIST", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_FAR_CLIP_DIST); + GRAPHICS.set_function("SET_PARTICLE_FX_LOOPED_CAMERA_BIAS_", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_LOOPED_CAMERA_BIAS_); GRAPHICS.set_function("SET_PARTICLE_FX_CAM_INSIDE_VEHICLE", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_CAM_INSIDE_VEHICLE); GRAPHICS.set_function("SET_PARTICLE_FX_CAM_INSIDE_NONPLAYER_VEHICLE", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_CAM_INSIDE_NONPLAYER_VEHICLE); GRAPHICS.set_function("SET_PARTICLE_FX_SHOOTOUT_BOAT", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_SHOOTOUT_BOAT); @@ -2368,6 +2395,7 @@ namespace lua::native GRAPHICS.set_function("USE_PARTICLE_FX_ASSET", LUA_NATIVE_GRAPHICS_USE_PARTICLE_FX_ASSET); GRAPHICS.set_function("SET_PARTICLE_FX_OVERRIDE", LUA_NATIVE_GRAPHICS_SET_PARTICLE_FX_OVERRIDE); GRAPHICS.set_function("RESET_PARTICLE_FX_OVERRIDE", LUA_NATIVE_GRAPHICS_RESET_PARTICLE_FX_OVERRIDE); + GRAPHICS.set_function("START_VEHICLE_PARTICLE_FX_LOOPED_", LUA_NATIVE_GRAPHICS_START_VEHICLE_PARTICLE_FX_LOOPED_); GRAPHICS.set_function("SET_WEATHER_PTFX_USE_OVERRIDE_SETTINGS", LUA_NATIVE_GRAPHICS_SET_WEATHER_PTFX_USE_OVERRIDE_SETTINGS); GRAPHICS.set_function("SET_WEATHER_PTFX_OVERRIDE_CURR_LEVEL", LUA_NATIVE_GRAPHICS_SET_WEATHER_PTFX_OVERRIDE_CURR_LEVEL); GRAPHICS.set_function("WASH_DECALS_IN_RANGE", LUA_NATIVE_GRAPHICS_WASH_DECALS_IN_RANGE); @@ -2409,8 +2437,10 @@ namespace lua::native GRAPHICS.set_function("RENDER_SHADOWED_LIGHTS_WITH_NO_SHADOWS", LUA_NATIVE_GRAPHICS_RENDER_SHADOWED_LIGHTS_WITH_NO_SHADOWS); GRAPHICS.set_function("REQUEST_EARLY_LIGHT_CHECK", LUA_NATIVE_GRAPHICS_REQUEST_EARLY_LIGHT_CHECK); GRAPHICS.set_function("USE_SNOW_FOOT_VFX_WHEN_UNSHELTERED", LUA_NATIVE_GRAPHICS_USE_SNOW_FOOT_VFX_WHEN_UNSHELTERED); + GRAPHICS.set_function("FORCE_ALLOW_SNOW_FOOT_VFX_ON_ICE_", LUA_NATIVE_GRAPHICS_FORCE_ALLOW_SNOW_FOOT_VFX_ON_ICE_); GRAPHICS.set_function("USE_SNOW_WHEEL_VFX_WHEN_UNSHELTERED", LUA_NATIVE_GRAPHICS_USE_SNOW_WHEEL_VFX_WHEN_UNSHELTERED); GRAPHICS.set_function("DISABLE_REGION_VFX", LUA_NATIVE_GRAPHICS_DISABLE_REGION_VFX); + GRAPHICS.set_function("FORCE_GROUND_SNOW_PASS_", LUA_NATIVE_GRAPHICS_FORCE_GROUND_SNOW_PASS_); GRAPHICS.set_function("PRESET_INTERIOR_AMBIENT_CACHE", LUA_NATIVE_GRAPHICS_PRESET_INTERIOR_AMBIENT_CACHE); GRAPHICS.set_function("SET_TIMECYCLE_MODIFIER", LUA_NATIVE_GRAPHICS_SET_TIMECYCLE_MODIFIER); GRAPHICS.set_function("SET_TIMECYCLE_MODIFIER_STRENGTH", LUA_NATIVE_GRAPHICS_SET_TIMECYCLE_MODIFIER_STRENGTH); @@ -2486,6 +2516,7 @@ namespace lua::native GRAPHICS.set_function("DRAW_TV_CHANNEL", LUA_NATIVE_GRAPHICS_DRAW_TV_CHANNEL); GRAPHICS.set_function("SET_TV_CHANNEL_PLAYLIST", LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST); GRAPHICS.set_function("SET_TV_CHANNEL_PLAYLIST_AT_HOUR", LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST_AT_HOUR); + GRAPHICS.set_function("SET_TV_CHANNEL_PLAYLIST_DIRTY_", LUA_NATIVE_GRAPHICS_SET_TV_CHANNEL_PLAYLIST_DIRTY_); GRAPHICS.set_function("CLEAR_TV_CHANNEL_PLAYLIST", LUA_NATIVE_GRAPHICS_CLEAR_TV_CHANNEL_PLAYLIST); GRAPHICS.set_function("IS_PLAYLIST_ON_CHANNEL", LUA_NATIVE_GRAPHICS_IS_PLAYLIST_ON_CHANNEL); GRAPHICS.set_function("IS_TVSHOW_CURRENTLY_PLAYING", LUA_NATIVE_GRAPHICS_IS_TVSHOW_CURRENTLY_PLAYING); diff --git a/src/lua/natives/lua_native_binding_HUD.cpp b/src/lua/natives/lua_native_binding_HUD.cpp index b08fb90a..24fd69ec 100644 --- a/src/lua/natives/lua_native_binding_HUD.cpp +++ b/src/lua/natives/lua_native_binding_HUD.cpp @@ -3,9 +3,9 @@ namespace lua::native { - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_BUSYSPINNER_ON(const char* string) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_BUSYSPINNER_ON(sol::stack_object string) { - HUD::BEGIN_TEXT_COMMAND_BUSYSPINNER_ON(string); + HUD::BEGIN_TEXT_COMMAND_BUSYSPINNER_ON(string.is() ? string.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_BUSYSPINNER_ON(int busySpinnerType) @@ -199,49 +199,49 @@ namespace lua::native HUD::THEFEED_SET_SNAP_FEED_ITEM_POSITIONS(p0); } - static void LUA_NATIVE_HUD_THEFEED_UPDATE_ITEM_TEXTURE(const char* txdString1, const char* txnString1, const char* txdString2, const char* txnString2) + static void LUA_NATIVE_HUD_THEFEED_UPDATE_ITEM_TEXTURE(sol::stack_object txdString1, sol::stack_object txnString1, sol::stack_object txdString2, sol::stack_object txnString2) { - HUD::THEFEED_UPDATE_ITEM_TEXTURE(txdString1, txnString1, txdString2, txnString2); + HUD::THEFEED_UPDATE_ITEM_TEXTURE(txdString1.is() ? txdString1.as() : nullptr, txnString1.is() ? txnString1.as() : nullptr, txdString2.is() ? txdString2.as() : nullptr, txnString2.is() ? txnString2.as() : nullptr); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_THEFEED_POST(const char* text) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_THEFEED_POST(sol::stack_object text) { - HUD::BEGIN_TEXT_COMMAND_THEFEED_POST(text); + HUD::BEGIN_TEXT_COMMAND_THEFEED_POST(text.is() ? text.as() : nullptr); } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_STATS(const char* statTitle, int iconEnum, bool stepVal, int barValue, bool isImportant, const char* pictureTextureDict, const char* pictureTextureName) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_STATS(sol::stack_object statTitle, int iconEnum, bool stepVal, int barValue, bool isImportant, sol::stack_object pictureTextureDict, sol::stack_object pictureTextureName) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_STATS(statTitle, iconEnum, stepVal, barValue, isImportant, pictureTextureDict, pictureTextureName); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_STATS(statTitle.is() ? statTitle.as() : nullptr, iconEnum, stepVal, barValue, isImportant, pictureTextureDict.is() ? pictureTextureDict.as() : nullptr, pictureTextureName.is() ? pictureTextureName.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT(const char* txdName, const char* textureName, bool flash, int iconType, const char* sender, const char* subject) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT(sol::stack_object txdName, sol::stack_object textureName, bool flash, int iconType, sol::stack_object sender, sol::stack_object subject) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT(txdName, textureName, flash, iconType, sender, subject); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT(txdName.is() ? txdName.as() : nullptr, textureName.is() ? textureName.as() : nullptr, flash, iconType, sender.is() ? sender.as() : nullptr, subject.is() ? subject.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_SUBTITLE_LABEL(const char* txdName, const char* textureName, bool flash, int iconType, const char* sender, const char* subject) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_SUBTITLE_LABEL(sol::stack_object txdName, sol::stack_object textureName, bool flash, int iconType, sol::stack_object sender, sol::stack_object subject) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_SUBTITLE_LABEL(txdName, textureName, flash, iconType, sender, subject); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_SUBTITLE_LABEL(txdName.is() ? txdName.as() : nullptr, textureName.is() ? textureName.as() : nullptr, flash, iconType, sender.is() ? sender.as() : nullptr, subject.is() ? subject.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_TU(const char* txdName, const char* textureName, bool flash, int iconType, const char* sender, const char* subject, float duration) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_TU(sol::stack_object txdName, sol::stack_object textureName, bool flash, int iconType, sol::stack_object sender, sol::stack_object subject, float duration) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_TU(txdName, textureName, flash, iconType, sender, subject, duration); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_TU(txdName.is() ? txdName.as() : nullptr, textureName.is() ? textureName.as() : nullptr, flash, iconType, sender.is() ? sender.as() : nullptr, subject.is() ? subject.as() : nullptr, duration); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG(const char* txdName, const char* textureName, bool flash, int iconType, const char* sender, const char* subject, float duration, const char* clanTag) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG(sol::stack_object txdName, sol::stack_object textureName, bool flash, int iconType, sol::stack_object sender, sol::stack_object subject, float duration, sol::stack_object clanTag) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG(txdName, textureName, flash, iconType, sender, subject, duration, clanTag); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG(txdName.is() ? txdName.as() : nullptr, textureName.is() ? textureName.as() : nullptr, flash, iconType, sender.is() ? sender.as() : nullptr, subject.is() ? subject.as() : nullptr, duration, clanTag.is() ? clanTag.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG_AND_ADDITIONAL_ICON(const char* txdName, const char* textureName, bool flash, int iconType1, const char* sender, const char* subject, float duration, const char* clanTag, int iconType2, int p9) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG_AND_ADDITIONAL_ICON(sol::stack_object txdName, sol::stack_object textureName, bool flash, int iconType1, sol::stack_object sender, sol::stack_object subject, float duration, sol::stack_object clanTag, int iconType2, int p9) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG_AND_ADDITIONAL_ICON(txdName, textureName, flash, iconType1, sender, subject, duration, clanTag, iconType2, p9); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_MESSAGETEXT_WITH_CREW_TAG_AND_ADDITIONAL_ICON(txdName.is() ? txdName.as() : nullptr, textureName.is() ? textureName.as() : nullptr, flash, iconType1, sender.is() ? sender.as() : nullptr, subject.is() ? subject.as() : nullptr, duration, clanTag.is() ? clanTag.as() : nullptr, iconType2, p9); return retval; } @@ -263,9 +263,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_AWARD(const char* textureDict, const char* textureName, int rpBonus, int colorOverlay, const char* titleLabel) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_AWARD(sol::stack_object textureDict, sol::stack_object textureName, int rpBonus, int colorOverlay, sol::stack_object titleLabel) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_AWARD(textureDict, textureName, rpBonus, colorOverlay, titleLabel); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_AWARD(textureDict.is() ? textureDict.as() : nullptr, textureName.is() ? textureName.as() : nullptr, rpBonus, colorOverlay, titleLabel.is() ? titleLabel.as() : nullptr); return retval; } @@ -278,24 +278,24 @@ namespace lua::native return return_values; } - static std::tuple LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_CREWTAG_WITH_GAME_NAME(bool p0, bool p1, int p2, int p3, bool isLeader, bool unk0, int clanDesc, const char* playerName, int R, int G, int B) + static std::tuple LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_CREWTAG_WITH_GAME_NAME(bool p0, bool p1, int p2, int p3, bool isLeader, bool unk0, int clanDesc, sol::stack_object playerName, int R, int G, int B) { std::tuple return_values; - std::get<0>(return_values) = HUD::END_TEXT_COMMAND_THEFEED_POST_CREWTAG_WITH_GAME_NAME(p0, p1, &p2, p3, isLeader, unk0, clanDesc, playerName, R, G, B); + std::get<0>(return_values) = HUD::END_TEXT_COMMAND_THEFEED_POST_CREWTAG_WITH_GAME_NAME(p0, p1, &p2, p3, isLeader, unk0, clanDesc, playerName.is() ? playerName.as() : nullptr, R, G, B); std::get<1>(return_values) = p2; return return_values; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_UNLOCK(const char* gxtLabel1, int p1, const char* gxtLabel2) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_UNLOCK(sol::stack_object gxtLabel1, int p1, sol::stack_object gxtLabel2) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_UNLOCK(gxtLabel1, p1, gxtLabel2); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_UNLOCK(gxtLabel1.is() ? gxtLabel1.as() : nullptr, p1, gxtLabel2.is() ? gxtLabel2.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_UNLOCK_TU(const char* gxtLabel1, int p1, const char* gxtLabel2, int p3) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_UNLOCK_TU(sol::stack_object gxtLabel1, int p1, sol::stack_object gxtLabel2, int p3) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_UNLOCK_TU(gxtLabel1, p1, gxtLabel2, p3); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_UNLOCK_TU(gxtLabel1.is() ? gxtLabel1.as() : nullptr, p1, gxtLabel2.is() ? gxtLabel2.as() : nullptr, p3); return retval; } @@ -311,33 +311,33 @@ namespace lua::native return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_CREW_RANKUP_WITH_LITERAL_FLAG(const char* p0, const char* p1, const char* p2, bool p3, bool p4) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_CREW_RANKUP_WITH_LITERAL_FLAG(sol::stack_object p0, sol::stack_object p1, sol::stack_object p2, bool p3, bool p4) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_CREW_RANKUP_WITH_LITERAL_FLAG(p0, p1, p2, p3, p4); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_CREW_RANKUP_WITH_LITERAL_FLAG(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3, p4); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_VERSUS_TU(const char* txdName1, const char* textureName1, int count1, const char* txdName2, const char* textureName2, int count2, int hudColor1, int hudColor2) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_VERSUS_TU(sol::stack_object txdName1, sol::stack_object textureName1, int count1, sol::stack_object txdName2, sol::stack_object textureName2, int count2, int hudColor1, int hudColor2) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_VERSUS_TU(txdName1, textureName1, count1, txdName2, textureName2, count2, hudColor1, hudColor2); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_VERSUS_TU(txdName1.is() ? txdName1.as() : nullptr, textureName1.is() ? textureName1.as() : nullptr, count1, txdName2.is() ? txdName2.as() : nullptr, textureName2.is() ? textureName2.as() : nullptr, count2, hudColor1, hudColor2); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_REPLAY(int type, int image, const char* text) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_REPLAY(int type, int image, sol::stack_object text) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_REPLAY(type, image, text); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_REPLAY(type, image, text.is() ? text.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_REPLAY_INPUT(int type, const char* button, const char* text) + static int LUA_NATIVE_HUD_END_TEXT_COMMAND_THEFEED_POST_REPLAY_INPUT(int type, sol::stack_object button, sol::stack_object text) { - auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_REPLAY_INPUT(type, button, text); + auto retval = HUD::END_TEXT_COMMAND_THEFEED_POST_REPLAY_INPUT(type, button.is() ? button.as() : nullptr, text.is() ? text.as() : nullptr); return retval; } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_PRINT(const char* GxtEntry) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_PRINT(sol::stack_object GxtEntry) { - HUD::BEGIN_TEXT_COMMAND_PRINT(GxtEntry); + HUD::BEGIN_TEXT_COMMAND_PRINT(GxtEntry.is() ? GxtEntry.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_PRINT(int duration, bool drawImmediately) @@ -345,9 +345,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_PRINT(duration, drawImmediately); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_IS_MESSAGE_DISPLAYED(const char* text) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_IS_MESSAGE_DISPLAYED(sol::stack_object text) { - HUD::BEGIN_TEXT_COMMAND_IS_MESSAGE_DISPLAYED(text); + HUD::BEGIN_TEXT_COMMAND_IS_MESSAGE_DISPLAYED(text.is() ? text.as() : nullptr); } static bool LUA_NATIVE_HUD_END_TEXT_COMMAND_IS_MESSAGE_DISPLAYED() @@ -356,9 +356,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_DISPLAY_TEXT(const char* text) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_DISPLAY_TEXT(sol::stack_object text) { - HUD::BEGIN_TEXT_COMMAND_DISPLAY_TEXT(text); + HUD::BEGIN_TEXT_COMMAND_DISPLAY_TEXT(text.is() ? text.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_DISPLAY_TEXT(float x, float y, int p2) @@ -366,9 +366,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_DISPLAY_TEXT(x, y, p2); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_GET_SCREEN_WIDTH_OF_DISPLAY_TEXT(const char* text) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_GET_SCREEN_WIDTH_OF_DISPLAY_TEXT(sol::stack_object text) { - HUD::BEGIN_TEXT_COMMAND_GET_SCREEN_WIDTH_OF_DISPLAY_TEXT(text); + HUD::BEGIN_TEXT_COMMAND_GET_SCREEN_WIDTH_OF_DISPLAY_TEXT(text.is() ? text.as() : nullptr); } static float LUA_NATIVE_HUD_END_TEXT_COMMAND_GET_SCREEN_WIDTH_OF_DISPLAY_TEXT(bool p0) @@ -377,9 +377,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_GET_NUMBER_OF_LINES_FOR_STRING(const char* entry) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_GET_NUMBER_OF_LINES_FOR_STRING(sol::stack_object entry) { - HUD::BEGIN_TEXT_COMMAND_GET_NUMBER_OF_LINES_FOR_STRING(entry); + HUD::BEGIN_TEXT_COMMAND_GET_NUMBER_OF_LINES_FOR_STRING(entry.is() ? entry.as() : nullptr); } static int LUA_NATIVE_HUD_END_TEXT_COMMAND_GET_NUMBER_OF_LINES_FOR_STRING(float x, float y) @@ -388,9 +388,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_DISPLAY_HELP(const char* inputType) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_DISPLAY_HELP(sol::stack_object inputType) { - HUD::BEGIN_TEXT_COMMAND_DISPLAY_HELP(inputType); + HUD::BEGIN_TEXT_COMMAND_DISPLAY_HELP(inputType.is() ? inputType.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_DISPLAY_HELP(int p0, bool loop, bool beep, int shape) @@ -398,9 +398,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_DISPLAY_HELP(p0, loop, beep, shape); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(const char* labelName) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(sol::stack_object labelName) { - HUD::BEGIN_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(labelName); + HUD::BEGIN_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(labelName.is() ? labelName.as() : nullptr); } static bool LUA_NATIVE_HUD_END_TEXT_COMMAND_IS_THIS_HELP_MESSAGE_BEING_DISPLAYED(int p0) @@ -409,9 +409,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_SET_BLIP_NAME(const char* textLabel) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_SET_BLIP_NAME(sol::stack_object textLabel) { - HUD::BEGIN_TEXT_COMMAND_SET_BLIP_NAME(textLabel); + HUD::BEGIN_TEXT_COMMAND_SET_BLIP_NAME(textLabel.is() ? textLabel.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_SET_BLIP_NAME(Blip blip) @@ -419,9 +419,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_SET_BLIP_NAME(blip); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(const char* p0) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(sol::stack_object p0) { - HUD::BEGIN_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(p0); + HUD::BEGIN_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(bool p0) @@ -429,9 +429,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_ADD_DIRECTLY_TO_PREVIOUS_BRIEFS(p0); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_CLEAR_PRINT(const char* text) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_CLEAR_PRINT(sol::stack_object text) { - HUD::BEGIN_TEXT_COMMAND_CLEAR_PRINT(text); + HUD::BEGIN_TEXT_COMMAND_CLEAR_PRINT(text.is() ? text.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_CLEAR_PRINT() @@ -439,9 +439,9 @@ namespace lua::native HUD::END_TEXT_COMMAND_CLEAR_PRINT(); } - static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_OVERRIDE_BUTTON_TEXT(const char* gxtEntry) + static void LUA_NATIVE_HUD_BEGIN_TEXT_COMMAND_OVERRIDE_BUTTON_TEXT(sol::stack_object gxtEntry) { - HUD::BEGIN_TEXT_COMMAND_OVERRIDE_BUTTON_TEXT(gxtEntry); + HUD::BEGIN_TEXT_COMMAND_OVERRIDE_BUTTON_TEXT(gxtEntry.is() ? gxtEntry.as() : nullptr); } static void LUA_NATIVE_HUD_END_TEXT_COMMAND_OVERRIDE_BUTTON_TEXT(int p0) @@ -459,9 +459,9 @@ namespace lua::native HUD::ADD_TEXT_COMPONENT_FLOAT(value, decimalPlaces); } - static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_TEXT_LABEL(const char* labelName) + static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_TEXT_LABEL(sol::stack_object labelName) { - HUD::ADD_TEXT_COMPONENT_SUBSTRING_TEXT_LABEL(labelName); + HUD::ADD_TEXT_COMPONENT_SUBSTRING_TEXT_LABEL(labelName.is() ? labelName.as() : nullptr); } static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_TEXT_LABEL_HASH_KEY(Hash gxtEntryHash) @@ -474,9 +474,9 @@ namespace lua::native HUD::ADD_TEXT_COMPONENT_SUBSTRING_BLIP_NAME(blip); } - static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(const char* text) + static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(sol::stack_object text) { - HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(text); + HUD::ADD_TEXT_COMPONENT_SUBSTRING_PLAYER_NAME(text.is() ? text.as() : nullptr); } static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_TIME(int timestamp, int flags) @@ -489,19 +489,19 @@ namespace lua::native HUD::ADD_TEXT_COMPONENT_FORMATTED_INTEGER(value, commaSeparated); } - static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_PHONE_NUMBER(const char* p0, int p1) + static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_PHONE_NUMBER(sol::stack_object p0, int p1) { - HUD::ADD_TEXT_COMPONENT_SUBSTRING_PHONE_NUMBER(p0, p1); + HUD::ADD_TEXT_COMPONENT_SUBSTRING_PHONE_NUMBER(p0.is() ? p0.as() : nullptr, p1); } - static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_WEBSITE(const char* website) + static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_WEBSITE(sol::stack_object website) { - HUD::ADD_TEXT_COMPONENT_SUBSTRING_WEBSITE(website); + HUD::ADD_TEXT_COMPONENT_SUBSTRING_WEBSITE(website.is() ? website.as() : nullptr); } - static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_KEYBOARD_DISPLAY(const char* string) + static void LUA_NATIVE_HUD_ADD_TEXT_COMPONENT_SUBSTRING_KEYBOARD_DISPLAY(sol::stack_object string) { - HUD::ADD_TEXT_COMPONENT_SUBSTRING_KEYBOARD_DISPLAY(string); + HUD::ADD_TEXT_COMPONENT_SUBSTRING_KEYBOARD_DISPLAY(string.is() ? string.as() : nullptr); } static void LUA_NATIVE_HUD_SET_COLOUR_OF_NEXT_TEXT_COMPONENT(int hudColor) @@ -509,27 +509,27 @@ namespace lua::native HUD::SET_COLOUR_OF_NEXT_TEXT_COMPONENT(hudColor); } - static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME(const char* text, int position, int length) + static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME(sol::stack_object text, int position, int length) { - auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME(text, position, length); + auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME(text.is() ? text.as() : nullptr, position, length); return retval; } - static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_WITH_BYTE_LIMIT(const char* text, int position, int length, int maxLength) + static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_WITH_BYTE_LIMIT(sol::stack_object text, int position, int length, int maxLength) { - auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_WITH_BYTE_LIMIT(text, position, length, maxLength); + auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_WITH_BYTE_LIMIT(text.is() ? text.as() : nullptr, position, length, maxLength); return retval; } - static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_BYTES(const char* text, int startPosition, int endPosition) + static const char* LUA_NATIVE_HUD_GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_BYTES(sol::stack_object text, int startPosition, int endPosition) { - auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_BYTES(text, startPosition, endPosition); + auto retval = HUD::GET_CHARACTER_FROM_AUDIO_CONVERSATION_FILENAME_BYTES(text.is() ? text.as() : nullptr, startPosition, endPosition); return retval; } - static const char* LUA_NATIVE_HUD_GET_FILENAME_FOR_AUDIO_CONVERSATION(const char* labelName) + static const char* LUA_NATIVE_HUD_GET_FILENAME_FOR_AUDIO_CONVERSATION(sol::stack_object labelName) { - auto retval = HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(labelName); + auto retval = HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(labelName.is() ? labelName.as() : nullptr); return retval; } @@ -548,9 +548,9 @@ namespace lua::native HUD::CLEAR_ALL_HELP_MESSAGES(); } - static void LUA_NATIVE_HUD_CLEAR_THIS_PRINT(const char* p0) + static void LUA_NATIVE_HUD_CLEAR_THIS_PRINT(sol::stack_object p0) { - HUD::CLEAR_THIS_PRINT(p0); + HUD::CLEAR_THIS_PRINT(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_HUD_CLEAR_SMALL_PRINTS() @@ -558,20 +558,20 @@ namespace lua::native HUD::CLEAR_SMALL_PRINTS(); } - static bool LUA_NATIVE_HUD_DOES_TEXT_BLOCK_EXIST(const char* gxt) + static bool LUA_NATIVE_HUD_DOES_TEXT_BLOCK_EXIST(sol::stack_object gxt) { - auto retval = (bool)HUD::DOES_TEXT_BLOCK_EXIST(gxt); + auto retval = (bool)HUD::DOES_TEXT_BLOCK_EXIST(gxt.is() ? gxt.as() : nullptr); return retval; } - static void LUA_NATIVE_HUD_REQUEST_ADDITIONAL_TEXT(const char* gxt, int slot) + static void LUA_NATIVE_HUD_REQUEST_ADDITIONAL_TEXT(sol::stack_object gxt, int slot) { - HUD::REQUEST_ADDITIONAL_TEXT(gxt, slot); + HUD::REQUEST_ADDITIONAL_TEXT(gxt.is() ? gxt.as() : nullptr, slot); } - static void LUA_NATIVE_HUD_REQUEST_ADDITIONAL_TEXT_FOR_DLC(const char* gxt, int slot) + static void LUA_NATIVE_HUD_REQUEST_ADDITIONAL_TEXT_FOR_DLC(sol::stack_object gxt, int slot) { - HUD::REQUEST_ADDITIONAL_TEXT_FOR_DLC(gxt, slot); + HUD::REQUEST_ADDITIONAL_TEXT_FOR_DLC(gxt.is() ? gxt.as() : nullptr, slot); } static bool LUA_NATIVE_HUD_HAS_ADDITIONAL_TEXT_LOADED(int slot) @@ -591,9 +591,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_HUD_HAS_THIS_ADDITIONAL_TEXT_LOADED(const char* gxt, int slot) + static bool LUA_NATIVE_HUD_HAS_THIS_ADDITIONAL_TEXT_LOADED(sol::stack_object gxt, int slot) { - auto retval = (bool)HUD::HAS_THIS_ADDITIONAL_TEXT_LOADED(gxt, slot); + auto retval = (bool)HUD::HAS_THIS_ADDITIONAL_TEXT_LOADED(gxt.is() ? gxt.as() : nullptr, slot); return retval; } @@ -603,33 +603,33 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_HUD_DOES_TEXT_LABEL_EXIST(const char* gxt) + static bool LUA_NATIVE_HUD_DOES_TEXT_LABEL_EXIST(sol::stack_object gxt) { - auto retval = (bool)HUD::DOES_TEXT_LABEL_EXIST(gxt); + auto retval = (bool)HUD::DOES_TEXT_LABEL_EXIST(gxt.is() ? gxt.as() : nullptr); return retval; } - static const char* LUA_NATIVE_HUD_GET_FIRST_N_CHARACTERS_OF_LITERAL_STRING(const char* string, int length) + static const char* LUA_NATIVE_HUD_GET_FIRST_N_CHARACTERS_OF_LITERAL_STRING(sol::stack_object string, int length) { - auto retval = HUD::GET_FIRST_N_CHARACTERS_OF_LITERAL_STRING(string, length); + auto retval = HUD::GET_FIRST_N_CHARACTERS_OF_LITERAL_STRING(string.is() ? string.as() : nullptr, length); return retval; } - static int LUA_NATIVE_HUD_GET_LENGTH_OF_STRING_WITH_THIS_TEXT_LABEL(const char* gxt) + static int LUA_NATIVE_HUD_GET_LENGTH_OF_STRING_WITH_THIS_TEXT_LABEL(sol::stack_object gxt) { - auto retval = HUD::GET_LENGTH_OF_STRING_WITH_THIS_TEXT_LABEL(gxt); + auto retval = HUD::GET_LENGTH_OF_STRING_WITH_THIS_TEXT_LABEL(gxt.is() ? gxt.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_GET_LENGTH_OF_LITERAL_STRING(const char* string) + static int LUA_NATIVE_HUD_GET_LENGTH_OF_LITERAL_STRING(sol::stack_object string) { - auto retval = HUD::GET_LENGTH_OF_LITERAL_STRING(string); + auto retval = HUD::GET_LENGTH_OF_LITERAL_STRING(string.is() ? string.as() : nullptr); return retval; } - static int LUA_NATIVE_HUD_GET_LENGTH_OF_LITERAL_STRING_IN_BYTES(const char* string) + static int LUA_NATIVE_HUD_GET_LENGTH_OF_LITERAL_STRING_IN_BYTES(sol::stack_object string) { - auto retval = HUD::GET_LENGTH_OF_LITERAL_STRING_IN_BYTES(string); + auto retval = HUD::GET_LENGTH_OF_LITERAL_STRING_IN_BYTES(string.is() ? string.as() : nullptr); return retval; } @@ -711,6 +711,11 @@ namespace lua::native HUD::USE_VEHICLE_TARGETING_RETICULE(p0); } + static void LUA_NATIVE_HUD_USE_VEHICLE_TARGETING_RETICULE_ON_VEHICLES_(bool enable) + { + HUD::_USE_VEHICLE_TARGETING_RETICULE_ON_VEHICLES(enable); + } + static void LUA_NATIVE_HUD_ADD_VALID_VEHICLE_HIT_HASH(Any p0) { HUD::ADD_VALID_VEHICLE_HIT_HASH(p0); @@ -884,6 +889,11 @@ namespace lua::native HUD::SET_TEXT_JUSTIFICATION(justifyType); } + static void LUA_NATIVE_HUD_SET_TEXT_LINE_HEIGHT_MULT(float lineHeightMult) + { + HUD::SET_TEXT_LINE_HEIGHT_MULT(lineHeightMult); + } + static void LUA_NATIVE_HUD_SET_TEXT_WRAP(float start, float end) { HUD::SET_TEXT_WRAP(start, end); @@ -935,21 +945,21 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_HUD_REGISTER_NAMED_RENDERTARGET(const char* name, bool p1) + static bool LUA_NATIVE_HUD_REGISTER_NAMED_RENDERTARGET(sol::stack_object name, bool p1) { - auto retval = (bool)HUD::REGISTER_NAMED_RENDERTARGET(name, p1); + auto retval = (bool)HUD::REGISTER_NAMED_RENDERTARGET(name.is() ? name.as() : nullptr, p1); return retval; } - static bool LUA_NATIVE_HUD_IS_NAMED_RENDERTARGET_REGISTERED(const char* name) + static bool LUA_NATIVE_HUD_IS_NAMED_RENDERTARGET_REGISTERED(sol::stack_object name) { - auto retval = (bool)HUD::IS_NAMED_RENDERTARGET_REGISTERED(name); + auto retval = (bool)HUD::IS_NAMED_RENDERTARGET_REGISTERED(name.is() ? name.as() : nullptr); return retval; } - static bool LUA_NATIVE_HUD_RELEASE_NAMED_RENDERTARGET(const char* name) + static bool LUA_NATIVE_HUD_RELEASE_NAMED_RENDERTARGET(sol::stack_object name) { - auto retval = (bool)HUD::RELEASE_NAMED_RENDERTARGET(name); + auto retval = (bool)HUD::RELEASE_NAMED_RENDERTARGET(name.is() ? name.as() : nullptr); return retval; } @@ -958,9 +968,9 @@ namespace lua::native HUD::LINK_NAMED_RENDERTARGET(modelHash); } - static int LUA_NATIVE_HUD_GET_NAMED_RENDERTARGET_RENDER_ID(const char* name) + static int LUA_NATIVE_HUD_GET_NAMED_RENDERTARGET_RENDER_ID(sol::stack_object name) { - auto retval = HUD::GET_NAMED_RENDERTARGET_RENDER_ID(name); + auto retval = HUD::GET_NAMED_RENDERTARGET_RENDER_ID(name.is() ? name.as() : nullptr); return retval; } @@ -1148,9 +1158,9 @@ namespace lua::native HUD::SET_COP_BLIP_SPRITE_AS_STANDARD(); } - static void LUA_NATIVE_HUD_SET_BLIP_NAME_FROM_TEXT_FILE(Blip blip, const char* gxtEntry) + static void LUA_NATIVE_HUD_SET_BLIP_NAME_FROM_TEXT_FILE(Blip blip, sol::stack_object gxtEntry) { - HUD::SET_BLIP_NAME_FROM_TEXT_FILE(blip, gxtEntry); + HUD::SET_BLIP_NAME_FROM_TEXT_FILE(blip, gxtEntry.is() ? gxtEntry.as() : nullptr); } static void LUA_NATIVE_HUD_SET_BLIP_NAME_TO_PLAYER_NAME(Blip blip, Player player) @@ -1498,6 +1508,11 @@ namespace lua::native HUD::CLEAR_FAKE_CONE_ARRAY(); } + static void LUA_NATIVE_HUD_SET_BLIP_GPS_ROUTE_DISPLAY_DISTANCE_(Blip blip, int blipChangeParam46, bool blipChangeParam47) + { + HUD::_SET_BLIP_GPS_ROUTE_DISPLAY_DISTANCE(blip, blipChangeParam46, blipChangeParam47); + } + static bool LUA_NATIVE_HUD_SET_MINIMAP_COMPONENT(int componentId, bool toggle, int overrideColor) { auto retval = (bool)HUD::SET_MINIMAP_COMPONENT(componentId, toggle, overrideColor); @@ -1687,9 +1702,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_DISPLAY_HELP_TEXT_THIS_FRAME(const char* message, bool p1) + static void LUA_NATIVE_HUD_DISPLAY_HELP_TEXT_THIS_FRAME(sol::stack_object message, bool p1) { - HUD::DISPLAY_HELP_TEXT_THIS_FRAME(message, p1); + HUD::DISPLAY_HELP_TEXT_THIS_FRAME(message.is() ? message.as() : nullptr, p1); } static void LUA_NATIVE_HUD_HUD_FORCE_WEAPON_WHEEL(bool show) @@ -1824,19 +1839,19 @@ namespace lua::native HUD::SET_MINIMAP_IN_SPECTATOR_MODE(toggle, ped); } - static void LUA_NATIVE_HUD_SET_MISSION_NAME(bool p0, const char* name) + static void LUA_NATIVE_HUD_SET_MISSION_NAME(bool p0, sol::stack_object name) { - HUD::SET_MISSION_NAME(p0, name); + HUD::SET_MISSION_NAME(p0, name.is() ? name.as() : nullptr); } - static void LUA_NATIVE_HUD_SET_MISSION_NAME_FOR_UGC_MISSION(bool p0, const char* name) + static void LUA_NATIVE_HUD_SET_MISSION_NAME_FOR_UGC_MISSION(bool p0, sol::stack_object name) { - HUD::SET_MISSION_NAME_FOR_UGC_MISSION(p0, name); + HUD::SET_MISSION_NAME_FOR_UGC_MISSION(p0, name.is() ? name.as() : nullptr); } - static void LUA_NATIVE_HUD_SET_DESCRIPTION_FOR_UGC_MISSION_EIGHT_STRINGS(bool p0, const char* p1, const char* p2, const char* p3, const char* p4, const char* p5, const char* p6, const char* p7, const char* p8) + static void LUA_NATIVE_HUD_SET_DESCRIPTION_FOR_UGC_MISSION_EIGHT_STRINGS(bool p0, sol::stack_object p1, sol::stack_object p2, sol::stack_object p3, sol::stack_object p4, sol::stack_object p5, sol::stack_object p6, sol::stack_object p7, sol::stack_object p8) { - HUD::SET_DESCRIPTION_FOR_UGC_MISSION_EIGHT_STRINGS(p0, p1, p2, p3, p4, p5, p6, p7, p8); + HUD::SET_DESCRIPTION_FOR_UGC_MISSION_EIGHT_STRINGS(p0, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3.is() ? p3.as() : nullptr, p4.is() ? p4.as() : nullptr, p5.is() ? p5.as() : nullptr, p6.is() ? p6.as() : nullptr, p7.is() ? p7.as() : nullptr, p8.is() ? p8.as() : nullptr); } static void LUA_NATIVE_HUD_SET_MINIMAP_BLOCK_WAYPOINT(bool toggle) @@ -2057,9 +2072,9 @@ namespace lua::native HUD::CLEAR_FLOATING_HELP(hudIndex, p1); } - static void LUA_NATIVE_HUD_CREATE_MP_GAMER_TAG_WITH_CREW_COLOR(Player player, const char* username, bool pointedClanTag, bool isRockstarClan, const char* clanTag, int clanFlag, int r, int g, int b) + static void LUA_NATIVE_HUD_CREATE_MP_GAMER_TAG_WITH_CREW_COLOR(Player player, sol::stack_object username, bool pointedClanTag, bool isRockstarClan, sol::stack_object clanTag, int clanFlag, int r, int g, int b) { - HUD::CREATE_MP_GAMER_TAG_WITH_CREW_COLOR(player, username, pointedClanTag, isRockstarClan, clanTag, clanFlag, r, g, b); + HUD::CREATE_MP_GAMER_TAG_WITH_CREW_COLOR(player, username.is() ? username.as() : nullptr, pointedClanTag, isRockstarClan, clanTag.is() ? clanTag.as() : nullptr, clanFlag, r, g, b); } static bool LUA_NATIVE_HUD_IS_MP_GAMER_TAG_MOVIE_ACTIVE() @@ -2068,9 +2083,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_HUD_CREATE_FAKE_MP_GAMER_TAG(Ped ped, const char* username, bool pointedClanTag, bool isRockstarClan, const char* clanTag, int clanFlag) + static int LUA_NATIVE_HUD_CREATE_FAKE_MP_GAMER_TAG(Ped ped, sol::stack_object username, bool pointedClanTag, bool isRockstarClan, sol::stack_object clanTag, int clanFlag) { - auto retval = HUD::CREATE_FAKE_MP_GAMER_TAG(ped, username, pointedClanTag, isRockstarClan, clanTag, clanFlag); + auto retval = HUD::CREATE_FAKE_MP_GAMER_TAG(ped, username.is() ? username.as() : nullptr, pointedClanTag, isRockstarClan, clanTag.is() ? clanTag.as() : nullptr, clanFlag); return retval; } @@ -2141,9 +2156,9 @@ namespace lua::native HUD::SET_MP_GAMER_TAG_NUM_PACKAGES(gamerTagId, p1); } - static void LUA_NATIVE_HUD_SET_MP_GAMER_TAG_NAME(int gamerTagId, const char* string) + static void LUA_NATIVE_HUD_SET_MP_GAMER_TAG_NAME(int gamerTagId, sol::stack_object string) { - HUD::SET_MP_GAMER_TAG_NAME(gamerTagId, string); + HUD::SET_MP_GAMER_TAG_NAME(gamerTagId, string.is() ? string.as() : nullptr); } static bool LUA_NATIVE_HUD_IS_UPDATING_MP_GAMER_TAG_NAME_AND_CREW_DETAILS(int gamerTagId) @@ -2152,9 +2167,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_SET_MP_GAMER_TAG_BIG_TEXT(int gamerTagId, const char* string) + static void LUA_NATIVE_HUD_SET_MP_GAMER_TAG_BIG_TEXT(int gamerTagId, sol::stack_object string) { - HUD::SET_MP_GAMER_TAG_BIG_TEXT(gamerTagId, string); + HUD::SET_MP_GAMER_TAG_BIG_TEXT(gamerTagId, string.is() ? string.as() : nullptr); } static int LUA_NATIVE_HUD_GET_CURRENT_WEBPAGE_ID() @@ -2186,39 +2201,39 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE(const char* titleMsg, int flags, const char* promptMsg, bool p3, int p4, const char* p5, const char* p6, bool showBackground, int errorCode) + static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE(sol::stack_object titleMsg, int flags, sol::stack_object promptMsg, bool p3, int p4, sol::stack_object p5, sol::stack_object p6, bool showBackground, int errorCode) { - HUD::SET_WARNING_MESSAGE(titleMsg, flags, promptMsg, p3, p4, p5, p6, showBackground, errorCode); + HUD::SET_WARNING_MESSAGE(titleMsg.is() ? titleMsg.as() : nullptr, flags, promptMsg.is() ? promptMsg.as() : nullptr, p3, p4, p5.is() ? p5.as() : nullptr, p6.is() ? p6.as() : nullptr, showBackground, errorCode); } - static std::tuple LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER(const char* entryHeader, const char* entryLine1, int instructionalKey, const char* entryLine2, bool p4, Any p5, Any showBackground, Any p7, bool p8, Any p9) + static std::tuple LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER(sol::stack_object entryHeader, sol::stack_object entryLine1, int instructionalKey, sol::stack_object entryLine2, bool p4, Any p5, Any showBackground, Any p7, bool p8, Any p9) { std::tuple return_values; - HUD::SET_WARNING_MESSAGE_WITH_HEADER(entryHeader, entryLine1, instructionalKey, entryLine2, p4, p5, &showBackground, &p7, p8, p9); + HUD::SET_WARNING_MESSAGE_WITH_HEADER(entryHeader.is() ? entryHeader.as() : nullptr, entryLine1.is() ? entryLine1.as() : nullptr, instructionalKey, entryLine2.is() ? entryLine2.as() : nullptr, p4, p5, &showBackground, &p7, p8, p9); std::get<0>(return_values) = showBackground; std::get<1>(return_values) = p7; return return_values; } - static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS(const char* entryHeader, const char* entryLine1, int instructionalKey, const char* entryLine2, bool p4, Any p5, Any additionalIntInfo, const char* additionalTextInfoLine1, const char* additionalTextInfoLine2, bool showBackground, int errorCode) + static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS(sol::stack_object entryHeader, sol::stack_object entryLine1, int instructionalKey, sol::stack_object entryLine2, bool p4, Any p5, Any additionalIntInfo, sol::stack_object additionalTextInfoLine1, sol::stack_object additionalTextInfoLine2, bool showBackground, int errorCode) { - HUD::SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS(entryHeader, entryLine1, instructionalKey, entryLine2, p4, p5, additionalIntInfo, additionalTextInfoLine1, additionalTextInfoLine2, showBackground, errorCode); + HUD::SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS(entryHeader.is() ? entryHeader.as() : nullptr, entryLine1.is() ? entryLine1.as() : nullptr, instructionalKey, entryLine2.is() ? entryLine2.as() : nullptr, p4, p5, additionalIntInfo, additionalTextInfoLine1.is() ? additionalTextInfoLine1.as() : nullptr, additionalTextInfoLine2.is() ? additionalTextInfoLine2.as() : nullptr, showBackground, errorCode); } - static std::tuple LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_EXTENDED(const char* entryHeader, const char* entryLine1, int flags, const char* entryLine2, bool p4, Any p5, Any p6, Any p7, bool showBg, Any p9, Any p10) + static std::tuple LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_EXTENDED(sol::stack_object entryHeader, sol::stack_object entryLine1, int flags, sol::stack_object entryLine2, bool p4, Any p5, Any p6, Any p7, bool showBg, Any p9, Any p10) { std::tuple return_values; - HUD::SET_WARNING_MESSAGE_WITH_HEADER_EXTENDED(entryHeader, entryLine1, flags, entryLine2, p4, p5, &p6, &p7, showBg, p9, p10); + HUD::SET_WARNING_MESSAGE_WITH_HEADER_EXTENDED(entryHeader.is() ? entryHeader.as() : nullptr, entryLine1.is() ? entryLine1.as() : nullptr, flags, entryLine2.is() ? entryLine2.as() : nullptr, p4, p5, &p6, &p7, showBg, p9, p10); std::get<0>(return_values) = p6; std::get<1>(return_values) = p7; return return_values; } - static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS_EXTENDED(const char* labelTitle, const char* labelMessage, int p2, int p3, const char* labelMessage2, bool p5, int p6, int p7, const char* p8, const char* p9, bool background, int errorCode) + static void LUA_NATIVE_HUD_SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS_EXTENDED(sol::stack_object labelTitle, sol::stack_object labelMessage, int p2, int p3, sol::stack_object labelMessage2, bool p5, int p6, int p7, sol::stack_object p8, sol::stack_object p9, bool background, int errorCode) { - HUD::SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS_EXTENDED(labelTitle, labelMessage, p2, p3, labelMessage2, p5, p6, p7, p8, p9, background, errorCode); + HUD::SET_WARNING_MESSAGE_WITH_HEADER_AND_SUBSTRING_FLAGS_EXTENDED(labelTitle.is() ? labelTitle.as() : nullptr, labelMessage.is() ? labelMessage.as() : nullptr, p2, p3, labelMessage2.is() ? labelMessage2.as() : nullptr, p5, p6, p7, p8.is() ? p8.as() : nullptr, p9.is() ? p9.as() : nullptr, background, errorCode); } static Hash LUA_NATIVE_HUD_GET_WARNING_SCREEN_MESSAGE_HASH() @@ -2227,9 +2242,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_HUD_SET_WARNING_MESSAGE_OPTION_ITEMS(int index, const char* name, int cash, int rp, int lvl, int colour) + static bool LUA_NATIVE_HUD_SET_WARNING_MESSAGE_OPTION_ITEMS(int index, sol::stack_object name, int cash, int rp, int lvl, int colour) { - auto retval = (bool)HUD::SET_WARNING_MESSAGE_OPTION_ITEMS(index, name, cash, rp, lvl, colour); + auto retval = (bool)HUD::SET_WARNING_MESSAGE_OPTION_ITEMS(index, name.is() ? name.as() : nullptr, cash, rp, lvl, colour); return retval; } @@ -2374,9 +2389,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_HUD_FORCE_SCRIPTED_GFX_WHEN_FRONTEND_ACTIVE(const char* p0) + static void LUA_NATIVE_HUD_FORCE_SCRIPTED_GFX_WHEN_FRONTEND_ACTIVE(sol::stack_object p0) { - HUD::FORCE_SCRIPTED_GFX_WHEN_FRONTEND_ACTIVE(p0); + HUD::FORCE_SCRIPTED_GFX_WHEN_FRONTEND_ACTIVE(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_HUD_PAUSE_MENUCEPTION_GO_DEEPER(int page) @@ -2653,9 +2668,9 @@ namespace lua::native HUD::CLOSE_SOCIAL_CLUB_MENU(); } - static void LUA_NATIVE_HUD_SET_SOCIAL_CLUB_TOUR(const char* name) + static void LUA_NATIVE_HUD_SET_SOCIAL_CLUB_TOUR(sol::stack_object name) { - HUD::SET_SOCIAL_CLUB_TOUR(name); + HUD::SET_SOCIAL_CLUB_TOUR(name.is() ? name.as() : nullptr); } static bool LUA_NATIVE_HUD_IS_SOCIAL_CLUB_ACTIVE() @@ -2926,6 +2941,7 @@ namespace lua::native HUD.set_function("IS_RADAR_HIDDEN", LUA_NATIVE_HUD_IS_RADAR_HIDDEN); HUD.set_function("IS_MINIMAP_RENDERING", LUA_NATIVE_HUD_IS_MINIMAP_RENDERING); HUD.set_function("USE_VEHICLE_TARGETING_RETICULE", LUA_NATIVE_HUD_USE_VEHICLE_TARGETING_RETICULE); + HUD.set_function("USE_VEHICLE_TARGETING_RETICULE_ON_VEHICLES_", LUA_NATIVE_HUD_USE_VEHICLE_TARGETING_RETICULE_ON_VEHICLES_); HUD.set_function("ADD_VALID_VEHICLE_HIT_HASH", LUA_NATIVE_HUD_ADD_VALID_VEHICLE_HIT_HASH); HUD.set_function("CLEAR_VALID_VEHICLE_HIT_HASHES", LUA_NATIVE_HUD_CLEAR_VALID_VEHICLE_HIT_HASHES); HUD.set_function("SET_BLIP_ROUTE", LUA_NATIVE_HUD_SET_BLIP_ROUTE); @@ -2959,6 +2975,7 @@ namespace lua::native HUD.set_function("SET_TEXT_CENTRE", LUA_NATIVE_HUD_SET_TEXT_CENTRE); HUD.set_function("SET_TEXT_RIGHT_JUSTIFY", LUA_NATIVE_HUD_SET_TEXT_RIGHT_JUSTIFY); HUD.set_function("SET_TEXT_JUSTIFICATION", LUA_NATIVE_HUD_SET_TEXT_JUSTIFICATION); + HUD.set_function("SET_TEXT_LINE_HEIGHT_MULT", LUA_NATIVE_HUD_SET_TEXT_LINE_HEIGHT_MULT); HUD.set_function("SET_TEXT_WRAP", LUA_NATIVE_HUD_SET_TEXT_WRAP); HUD.set_function("SET_TEXT_LEADING", LUA_NATIVE_HUD_SET_TEXT_LEADING); HUD.set_function("SET_TEXT_PROPORTIONAL", LUA_NATIVE_HUD_SET_TEXT_PROPORTIONAL); @@ -3073,6 +3090,7 @@ namespace lua::native HUD.set_function("SETUP_FAKE_CONE_DATA", LUA_NATIVE_HUD_SETUP_FAKE_CONE_DATA); HUD.set_function("REMOVE_FAKE_CONE_DATA", LUA_NATIVE_HUD_REMOVE_FAKE_CONE_DATA); HUD.set_function("CLEAR_FAKE_CONE_ARRAY", LUA_NATIVE_HUD_CLEAR_FAKE_CONE_ARRAY); + HUD.set_function("SET_BLIP_GPS_ROUTE_DISPLAY_DISTANCE_", LUA_NATIVE_HUD_SET_BLIP_GPS_ROUTE_DISPLAY_DISTANCE_); HUD.set_function("SET_MINIMAP_COMPONENT", LUA_NATIVE_HUD_SET_MINIMAP_COMPONENT); HUD.set_function("SET_MINIMAP_SONAR_SWEEP", LUA_NATIVE_HUD_SET_MINIMAP_SONAR_SWEEP); HUD.set_function("SHOW_ACCOUNT_PICKER", LUA_NATIVE_HUD_SHOW_ACCOUNT_PICKER); diff --git a/src/lua/natives/lua_native_binding_INTERIOR.cpp b/src/lua/natives/lua_native_binding_INTERIOR.cpp index 595a7103..142e1183 100644 --- a/src/lua/natives/lua_native_binding_INTERIOR.cpp +++ b/src/lua/natives/lua_native_binding_INTERIOR.cpp @@ -91,9 +91,9 @@ namespace lua::native INTERIOR::FORCE_ROOM_FOR_GAME_VIEWPORT(interiorID, roomHashKey); } - static void LUA_NATIVE_INTERIOR_SET_ROOM_FOR_GAME_VIEWPORT_BY_NAME(const char* roomName) + static void LUA_NATIVE_INTERIOR_SET_ROOM_FOR_GAME_VIEWPORT_BY_NAME(sol::stack_object roomName) { - INTERIOR::SET_ROOM_FOR_GAME_VIEWPORT_BY_NAME(roomName); + INTERIOR::SET_ROOM_FOR_GAME_VIEWPORT_BY_NAME(roomName.is() ? roomName.as() : nullptr); } static void LUA_NATIVE_INTERIOR_SET_ROOM_FOR_GAME_VIEWPORT_BY_KEY(Hash roomHashKey) @@ -124,9 +124,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_INTERIOR_ADD_PICKUP_TO_INTERIOR_ROOM_BY_NAME(Pickup pickup, const char* roomName) + static void LUA_NATIVE_INTERIOR_ADD_PICKUP_TO_INTERIOR_ROOM_BY_NAME(Pickup pickup, sol::stack_object roomName) { - INTERIOR::ADD_PICKUP_TO_INTERIOR_ROOM_BY_NAME(pickup, roomName); + INTERIOR::ADD_PICKUP_TO_INTERIOR_ROOM_BY_NAME(pickup, roomName.is() ? roomName.as() : nullptr); } static void LUA_NATIVE_INTERIOR_PIN_INTERIOR_IN_MEMORY(Interior interior) @@ -151,9 +151,9 @@ namespace lua::native return retval; } - static Interior LUA_NATIVE_INTERIOR_GET_INTERIOR_AT_COORDS_WITH_TYPE(float x, float y, float z, const char* interiorType) + static Interior LUA_NATIVE_INTERIOR_GET_INTERIOR_AT_COORDS_WITH_TYPE(float x, float y, float z, sol::stack_object interiorType) { - auto retval = INTERIOR::GET_INTERIOR_AT_COORDS_WITH_TYPE(x, y, z, interiorType); + auto retval = INTERIOR::GET_INTERIOR_AT_COORDS_WITH_TYPE(x, y, z, interiorType.is() ? interiorType.as() : nullptr); return retval; } @@ -185,25 +185,25 @@ namespace lua::native INTERIOR::ENABLE_STADIUM_PROBES_THIS_FRAME(toggle); } - static void LUA_NATIVE_INTERIOR_ACTIVATE_INTERIOR_ENTITY_SET(Interior interior, const char* entitySetName) + static void LUA_NATIVE_INTERIOR_ACTIVATE_INTERIOR_ENTITY_SET(Interior interior, sol::stack_object entitySetName) { - INTERIOR::ACTIVATE_INTERIOR_ENTITY_SET(interior, entitySetName); + INTERIOR::ACTIVATE_INTERIOR_ENTITY_SET(interior, entitySetName.is() ? entitySetName.as() : nullptr); } - static void LUA_NATIVE_INTERIOR_DEACTIVATE_INTERIOR_ENTITY_SET(Interior interior, const char* entitySetName) + static void LUA_NATIVE_INTERIOR_DEACTIVATE_INTERIOR_ENTITY_SET(Interior interior, sol::stack_object entitySetName) { - INTERIOR::DEACTIVATE_INTERIOR_ENTITY_SET(interior, entitySetName); + INTERIOR::DEACTIVATE_INTERIOR_ENTITY_SET(interior, entitySetName.is() ? entitySetName.as() : nullptr); } - static bool LUA_NATIVE_INTERIOR_IS_INTERIOR_ENTITY_SET_ACTIVE(Interior interior, const char* entitySetName) + static bool LUA_NATIVE_INTERIOR_IS_INTERIOR_ENTITY_SET_ACTIVE(Interior interior, sol::stack_object entitySetName) { - auto retval = (bool)INTERIOR::IS_INTERIOR_ENTITY_SET_ACTIVE(interior, entitySetName); + auto retval = (bool)INTERIOR::IS_INTERIOR_ENTITY_SET_ACTIVE(interior, entitySetName.is() ? entitySetName.as() : nullptr); return retval; } - static void LUA_NATIVE_INTERIOR_SET_INTERIOR_ENTITY_SET_TINT_INDEX(Interior interior, const char* entitySetName, int color) + static void LUA_NATIVE_INTERIOR_SET_INTERIOR_ENTITY_SET_TINT_INDEX(Interior interior, sol::stack_object entitySetName, int color) { - INTERIOR::SET_INTERIOR_ENTITY_SET_TINT_INDEX(interior, entitySetName, color); + INTERIOR::SET_INTERIOR_ENTITY_SET_TINT_INDEX(interior, entitySetName.is() ? entitySetName.as() : nullptr, color); } static void LUA_NATIVE_INTERIOR_REFRESH_INTERIOR(Interior interior) diff --git a/src/lua/natives/lua_native_binding_MISC.cpp b/src/lua/natives/lua_native_binding_MISC.cpp index a6b3601b..c3c5e927 100644 --- a/src/lua/natives/lua_native_binding_MISC.cpp +++ b/src/lua/natives/lua_native_binding_MISC.cpp @@ -53,19 +53,19 @@ namespace lua::native return retval; } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_CREATE(const char* p0, const char* p1) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_CREATE(sol::stack_object p0, sol::stack_object p1) { - MISC::ACTIVITY_FEED_CREATE(p0, p1); + MISC::ACTIVITY_FEED_CREATE(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_ADD_SUBSTRING_TO_CAPTION(const char* p0) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_ADD_SUBSTRING_TO_CAPTION(sol::stack_object p0) { - MISC::ACTIVITY_FEED_ADD_SUBSTRING_TO_CAPTION(p0); + MISC::ACTIVITY_FEED_ADD_SUBSTRING_TO_CAPTION(p0.is() ? p0.as() : nullptr); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_ADD_LITERAL_SUBSTRING_TO_CAPTION(const char* p0) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_ADD_LITERAL_SUBSTRING_TO_CAPTION(sol::stack_object p0) { - MISC::ACTIVITY_FEED_ADD_LITERAL_SUBSTRING_TO_CAPTION(p0); + MISC::ACTIVITY_FEED_ADD_LITERAL_SUBSTRING_TO_CAPTION(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_MISC_ACTIVITY_FEED_ADD_INT_TO_CAPTION(Any p0) @@ -73,19 +73,19 @@ namespace lua::native MISC::ACTIVITY_FEED_ADD_INT_TO_CAPTION(p0); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_LARGE_IMAGE_URL(const char* p0) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_LARGE_IMAGE_URL(sol::stack_object p0) { - MISC::ACTIVITY_FEED_LARGE_IMAGE_URL(p0); + MISC::ACTIVITY_FEED_LARGE_IMAGE_URL(p0.is() ? p0.as() : nullptr); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE(const char* p0, const char* p1) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE(sol::stack_object p0, sol::stack_object p1) { - MISC::ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE(p0, p1); + MISC::ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE_ADD(const char* p0) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE_ADD(sol::stack_object p0) { - MISC::ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE_ADD(p0); + MISC::ACTIVITY_FEED_ACTION_START_WITH_COMMAND_LINE_ADD(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_MISC_ACTIVITY_FEED_POST() @@ -93,9 +93,9 @@ namespace lua::native MISC::ACTIVITY_FEED_POST(); } - static void LUA_NATIVE_MISC_ACTIVITY_FEED_ONLINE_PLAYED_WITH_POST(const char* p0) + static void LUA_NATIVE_MISC_ACTIVITY_FEED_ONLINE_PLAYED_WITH_POST(sol::stack_object p0) { - MISC::ACTIVITY_FEED_ONLINE_PLAYED_WITH_POST(p0); + MISC::ACTIVITY_FEED_ONLINE_PLAYED_WITH_POST(p0.is() ? p0.as() : nullptr); } static bool LUA_NATIVE_MISC_HAS_RESUMED_FROM_SUSPEND() @@ -114,9 +114,9 @@ namespace lua::native MISC::SET_THIS_IS_A_TRIGGER_SCRIPT(toggle); } - static void LUA_NATIVE_MISC_INFORM_CODE_OF_CONTENT_ID_OF_CURRENT_UGC_MISSION(const char* p0) + static void LUA_NATIVE_MISC_INFORM_CODE_OF_CONTENT_ID_OF_CURRENT_UGC_MISSION(sol::stack_object p0) { - MISC::INFORM_CODE_OF_CONTENT_ID_OF_CURRENT_UGC_MISSION(p0); + MISC::INFORM_CODE_OF_CONTENT_ID_OF_CURRENT_UGC_MISSION(p0.is() ? p0.as() : nullptr); } static std::tuple LUA_NATIVE_MISC_GET_BASE_ELEMENT_LOCATION_FROM_METADATA_BLOCK(Any p0, Any p1, Any p2, bool p3) @@ -141,36 +141,36 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_MISC_IS_PREV_WEATHER_TYPE(const char* weatherType) + static bool LUA_NATIVE_MISC_IS_PREV_WEATHER_TYPE(sol::stack_object weatherType) { - auto retval = (bool)MISC::IS_PREV_WEATHER_TYPE(weatherType); + auto retval = (bool)MISC::IS_PREV_WEATHER_TYPE(weatherType.is() ? weatherType.as() : nullptr); return retval; } - static bool LUA_NATIVE_MISC_IS_NEXT_WEATHER_TYPE(const char* weatherType) + static bool LUA_NATIVE_MISC_IS_NEXT_WEATHER_TYPE(sol::stack_object weatherType) { - auto retval = (bool)MISC::IS_NEXT_WEATHER_TYPE(weatherType); + auto retval = (bool)MISC::IS_NEXT_WEATHER_TYPE(weatherType.is() ? weatherType.as() : nullptr); return retval; } - static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_PERSIST(const char* weatherType) + static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_PERSIST(sol::stack_object weatherType) { - MISC::SET_WEATHER_TYPE_PERSIST(weatherType); + MISC::SET_WEATHER_TYPE_PERSIST(weatherType.is() ? weatherType.as() : nullptr); } - static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_NOW_PERSIST(const char* weatherType) + static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_NOW_PERSIST(sol::stack_object weatherType) { - MISC::SET_WEATHER_TYPE_NOW_PERSIST(weatherType); + MISC::SET_WEATHER_TYPE_NOW_PERSIST(weatherType.is() ? weatherType.as() : nullptr); } - static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_NOW(const char* weatherType) + static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_NOW(sol::stack_object weatherType) { - MISC::SET_WEATHER_TYPE_NOW(weatherType); + MISC::SET_WEATHER_TYPE_NOW(weatherType.is() ? weatherType.as() : nullptr); } - static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_OVERTIME_PERSIST(const char* weatherType, float time) + static void LUA_NATIVE_MISC_SET_WEATHER_TYPE_OVERTIME_PERSIST(sol::stack_object weatherType, float time) { - MISC::SET_WEATHER_TYPE_OVERTIME_PERSIST(weatherType, time); + MISC::SET_WEATHER_TYPE_OVERTIME_PERSIST(weatherType.is() ? weatherType.as() : nullptr, time); } static void LUA_NATIVE_MISC_SET_RANDOM_WEATHER_TYPE() @@ -204,14 +204,14 @@ namespace lua::native MISC::SET_CURR_WEATHER_STATE(weatherType1, weatherType2, percentWeather2); } - static void LUA_NATIVE_MISC_SET_OVERRIDE_WEATHER(const char* weatherType) + static void LUA_NATIVE_MISC_SET_OVERRIDE_WEATHER(sol::stack_object weatherType) { - MISC::SET_OVERRIDE_WEATHER(weatherType); + MISC::SET_OVERRIDE_WEATHER(weatherType.is() ? weatherType.as() : nullptr); } - static void LUA_NATIVE_MISC_SET_OVERRIDE_WEATHEREX(const char* weatherType, bool p1) + static void LUA_NATIVE_MISC_SET_OVERRIDE_WEATHEREX(sol::stack_object weatherType, bool p1) { - MISC::SET_OVERRIDE_WEATHEREX(weatherType, p1); + MISC::SET_OVERRIDE_WEATHEREX(weatherType.is() ? weatherType.as() : nullptr, p1); } static void LUA_NATIVE_MISC_CLEAR_OVERRIDE_WEATHER() @@ -343,24 +343,24 @@ namespace lua::native MISC::FORCE_LIGHTNING_FLASH(); } - static void LUA_NATIVE_MISC_SET_CLOUD_SETTINGS_OVERRIDE(const char* p0) + static void LUA_NATIVE_MISC_SET_CLOUD_SETTINGS_OVERRIDE(sol::stack_object p0) { - MISC::SET_CLOUD_SETTINGS_OVERRIDE(p0); + MISC::SET_CLOUD_SETTINGS_OVERRIDE(p0.is() ? p0.as() : nullptr); } - static void LUA_NATIVE_MISC_PRELOAD_CLOUD_HAT(const char* name) + static void LUA_NATIVE_MISC_PRELOAD_CLOUD_HAT(sol::stack_object name) { - MISC::PRELOAD_CLOUD_HAT(name); + MISC::PRELOAD_CLOUD_HAT(name.is() ? name.as() : nullptr); } - static void LUA_NATIVE_MISC_LOAD_CLOUD_HAT(const char* name, float transitionTime) + static void LUA_NATIVE_MISC_LOAD_CLOUD_HAT(sol::stack_object name, float transitionTime) { - MISC::LOAD_CLOUD_HAT(name, transitionTime); + MISC::LOAD_CLOUD_HAT(name.is() ? name.as() : nullptr, transitionTime); } - static void LUA_NATIVE_MISC_UNLOAD_CLOUD_HAT(const char* name, float p1) + static void LUA_NATIVE_MISC_UNLOAD_CLOUD_HAT(sol::stack_object name, float p1) { - MISC::UNLOAD_CLOUD_HAT(name, p1); + MISC::UNLOAD_CLOUD_HAT(name.is() ? name.as() : nullptr, p1); } static void LUA_NATIVE_MISC_UNLOAD_ALL_CLOUD_HATS() @@ -536,9 +536,9 @@ namespace lua::native return address; } - static Hash LUA_NATIVE_MISC_GET_HASH_KEY(const char* string) + static Hash LUA_NATIVE_MISC_GET_HASH_KEY(sol::stack_object string) { - auto retval = MISC::GET_HASH_KEY(string); + auto retval = MISC::GET_HASH_KEY(string.is() ? string.as() : nullptr); return retval; } @@ -656,9 +656,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_MISC_TERMINATE_ALL_SCRIPTS_WITH_THIS_NAME(const char* scriptName) + static void LUA_NATIVE_MISC_TERMINATE_ALL_SCRIPTS_WITH_THIS_NAME(sol::stack_object scriptName) { - MISC::TERMINATE_ALL_SCRIPTS_WITH_THIS_NAME(scriptName); + MISC::TERMINATE_ALL_SCRIPTS_WITH_THIS_NAME(scriptName.is() ? scriptName.as() : nullptr); } static void LUA_NATIVE_MISC_NETWORK_SET_SCRIPT_IS_SAFE_FOR_NETWORK_GAME() @@ -728,9 +728,9 @@ namespace lua::native MISC::SET_FADE_IN_AFTER_LOAD(toggle); } - static int LUA_NATIVE_MISC_REGISTER_SAVE_HOUSE(float x, float y, float z, float p3, const char* p4, Any p5, Any p6) + static int LUA_NATIVE_MISC_REGISTER_SAVE_HOUSE(float x, float y, float z, float p3, sol::stack_object p4, Any p5, Any p6) { - auto retval = MISC::REGISTER_SAVE_HOUSE(x, y, z, p3, p4, p5, p6); + auto retval = MISC::REGISTER_SAVE_HOUSE(x, y, z, p3, p4.is() ? p4.as() : nullptr, p5, p6); return retval; } @@ -946,15 +946,15 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_MISC_ARE_STRINGS_EQUAL(const char* string1, const char* string2) + static bool LUA_NATIVE_MISC_ARE_STRINGS_EQUAL(sol::stack_object string1, sol::stack_object string2) { - auto retval = (bool)MISC::ARE_STRINGS_EQUAL(string1, string2); + auto retval = (bool)MISC::ARE_STRINGS_EQUAL(string1.is() ? string1.as() : nullptr, string2.is() ? string2.as() : nullptr); return retval; } - static int LUA_NATIVE_MISC_COMPARE_STRINGS(const char* str1, const char* str2, bool matchCase, int maxLength) + static int LUA_NATIVE_MISC_COMPARE_STRINGS(sol::stack_object str1, sol::stack_object str2, bool matchCase, int maxLength) { - auto retval = MISC::COMPARE_STRINGS(str1, str2, matchCase, maxLength); + auto retval = MISC::COMPARE_STRINGS(str1.is() ? str1.as() : nullptr, str2.is() ? str2.as() : nullptr, matchCase, maxLength); return retval; } @@ -1139,22 +1139,22 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_MISC_IS_STRING_NULL(const char* string) + static bool LUA_NATIVE_MISC_IS_STRING_NULL(sol::stack_object string) { - auto retval = (bool)MISC::IS_STRING_NULL(string); + auto retval = (bool)MISC::IS_STRING_NULL(string.is() ? string.as() : nullptr); return retval; } - static bool LUA_NATIVE_MISC_IS_STRING_NULL_OR_EMPTY(const char* string) + static bool LUA_NATIVE_MISC_IS_STRING_NULL_OR_EMPTY(sol::stack_object string) { - auto retval = (bool)MISC::IS_STRING_NULL_OR_EMPTY(string); + auto retval = (bool)MISC::IS_STRING_NULL_OR_EMPTY(string.is() ? string.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_MISC_STRING_TO_INT(const char* string, int outInteger) + static std::tuple LUA_NATIVE_MISC_STRING_TO_INT(sol::stack_object string, int outInteger) { std::tuple return_values; - std::get<0>(return_values) = (bool)MISC::STRING_TO_INT(string, &outInteger); + std::get<0>(return_values) = (bool)MISC::STRING_TO_INT(string.is() ? string.as() : nullptr, &outInteger); std::get<1>(return_values) = outInteger; return return_values; @@ -1319,69 +1319,69 @@ namespace lua::native return retval; } - static Any LUA_NATIVE_MISC_REGISTER_INT_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_INT_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_INT_TO_SAVE(&p0, name); + MISC::REGISTER_INT_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_INT64_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_INT64_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_INT64_TO_SAVE(&p0, name); + MISC::REGISTER_INT64_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_ENUM_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_ENUM_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_ENUM_TO_SAVE(&p0, name); + MISC::REGISTER_ENUM_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_FLOAT_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_FLOAT_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_FLOAT_TO_SAVE(&p0, name); + MISC::REGISTER_FLOAT_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_BOOL_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_BOOL_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_BOOL_TO_SAVE(&p0, name); + MISC::REGISTER_BOOL_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_TEXT_LABEL_TO_SAVE(&p0, name); + MISC::REGISTER_TEXT_LABEL_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_15_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_15_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_TEXT_LABEL_15_TO_SAVE(&p0, name); + MISC::REGISTER_TEXT_LABEL_15_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_23_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_23_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_TEXT_LABEL_23_TO_SAVE(&p0, name); + MISC::REGISTER_TEXT_LABEL_23_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_31_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_31_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_TEXT_LABEL_31_TO_SAVE(&p0, name); + MISC::REGISTER_TEXT_LABEL_31_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_63_TO_SAVE(Any p0, const char* name) + static Any LUA_NATIVE_MISC_REGISTER_TEXT_LABEL_63_TO_SAVE(Any p0, sol::stack_object name) { - MISC::REGISTER_TEXT_LABEL_63_TO_SAVE(&p0, name); + MISC::REGISTER_TEXT_LABEL_63_TO_SAVE(&p0, name.is() ? name.as() : nullptr); return p0; } - static Any LUA_NATIVE_MISC_START_SAVE_STRUCT_WITH_SIZE(Any p0, int size, const char* structName) + static Any LUA_NATIVE_MISC_START_SAVE_STRUCT_WITH_SIZE(Any p0, int size, sol::stack_object structName) { - MISC::START_SAVE_STRUCT_WITH_SIZE(&p0, size, structName); + MISC::START_SAVE_STRUCT_WITH_SIZE(&p0, size, structName.is() ? structName.as() : nullptr); return p0; } @@ -1390,9 +1390,9 @@ namespace lua::native MISC::STOP_SAVE_STRUCT(); } - static Any LUA_NATIVE_MISC_START_SAVE_ARRAY_WITH_SIZE(Any p0, int size, const char* arrayName) + static Any LUA_NATIVE_MISC_START_SAVE_ARRAY_WITH_SIZE(Any p0, int size, sol::stack_object arrayName) { - MISC::START_SAVE_ARRAY_WITH_SIZE(&p0, size, arrayName); + MISC::START_SAVE_ARRAY_WITH_SIZE(&p0, size, arrayName.is() ? arrayName.as() : nullptr); return p0; } @@ -1526,9 +1526,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_MISC_PLAY_TENNIS_SWING_ANIM(Ped ped, const char* animDict, const char* animName, float p3, float p4, bool p5) + static void LUA_NATIVE_MISC_PLAY_TENNIS_SWING_ANIM(Ped ped, sol::stack_object animDict, sol::stack_object animName, float p3, float p4, bool p5) { - MISC::PLAY_TENNIS_SWING_ANIM(ped, animDict, animName, p3, p4, p5); + MISC::PLAY_TENNIS_SWING_ANIM(ped, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, p3, p4, p5); } static bool LUA_NATIVE_MISC_GET_TENNIS_SWING_ANIM_COMPLETE(Ped ped) @@ -1554,9 +1554,9 @@ namespace lua::native MISC::PLAY_TENNIS_DIVE_ANIM(ped, p1, p2, p3, p4, p5); } - static void LUA_NATIVE_MISC_SET_TENNIS_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, const char* p1, float p2) + static void LUA_NATIVE_MISC_SET_TENNIS_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, sol::stack_object p1, float p2) { - MISC::SET_TENNIS_MOVE_NETWORK_SIGNAL_FLOAT(ped, p1, p2); + MISC::SET_TENNIS_MOVE_NETWORK_SIGNAL_FLOAT(ped, p1.is() ? p1.as() : nullptr, p2); } static void LUA_NATIVE_MISC_RESET_DISPATCH_SPAWN_LOCATION() @@ -1641,15 +1641,15 @@ namespace lua::native MISC::SET_RIOT_MODE_ENABLED(toggle); } - static Any LUA_NATIVE_MISC_DISPLAY_ONSCREEN_KEYBOARD_WITH_LONGER_INITIAL_STRING(int p0, const char* windowTitle, Any p2, const char* defaultText, const char* defaultConcat1, const char* defaultConcat2, const char* defaultConcat3, const char* defaultConcat4, const char* defaultConcat5, const char* defaultConcat6, const char* defaultConcat7, int maxInputLength) + static Any LUA_NATIVE_MISC_DISPLAY_ONSCREEN_KEYBOARD_WITH_LONGER_INITIAL_STRING(int p0, sol::stack_object windowTitle, Any p2, sol::stack_object defaultText, sol::stack_object defaultConcat1, sol::stack_object defaultConcat2, sol::stack_object defaultConcat3, sol::stack_object defaultConcat4, sol::stack_object defaultConcat5, sol::stack_object defaultConcat6, sol::stack_object defaultConcat7, int maxInputLength) { - MISC::DISPLAY_ONSCREEN_KEYBOARD_WITH_LONGER_INITIAL_STRING(p0, windowTitle, &p2, defaultText, defaultConcat1, defaultConcat2, defaultConcat3, defaultConcat4, defaultConcat5, defaultConcat6, defaultConcat7, maxInputLength); + MISC::DISPLAY_ONSCREEN_KEYBOARD_WITH_LONGER_INITIAL_STRING(p0, windowTitle.is() ? windowTitle.as() : nullptr, &p2, defaultText.is() ? defaultText.as() : nullptr, defaultConcat1.is() ? defaultConcat1.as() : nullptr, defaultConcat2.is() ? defaultConcat2.as() : nullptr, defaultConcat3.is() ? defaultConcat3.as() : nullptr, defaultConcat4.is() ? defaultConcat4.as() : nullptr, defaultConcat5.is() ? defaultConcat5.as() : nullptr, defaultConcat6.is() ? defaultConcat6.as() : nullptr, defaultConcat7.is() ? defaultConcat7.as() : nullptr, maxInputLength); return p2; } - static void LUA_NATIVE_MISC_DISPLAY_ONSCREEN_KEYBOARD(int p0, const char* windowTitle, const char* p2, const char* defaultText, const char* defaultConcat1, const char* defaultConcat2, const char* defaultConcat3, int maxInputLength) + static void LUA_NATIVE_MISC_DISPLAY_ONSCREEN_KEYBOARD(int p0, sol::stack_object windowTitle, sol::stack_object p2, sol::stack_object defaultText, sol::stack_object defaultConcat1, sol::stack_object defaultConcat2, sol::stack_object defaultConcat3, int maxInputLength) { - MISC::DISPLAY_ONSCREEN_KEYBOARD(p0, windowTitle, p2, defaultText, defaultConcat1, defaultConcat2, defaultConcat3, maxInputLength); + MISC::DISPLAY_ONSCREEN_KEYBOARD(p0, windowTitle.is() ? windowTitle.as() : nullptr, p2.is() ? p2.as() : nullptr, defaultText.is() ? defaultText.as() : nullptr, defaultConcat1.is() ? defaultConcat1.as() : nullptr, defaultConcat2.is() ? defaultConcat2.as() : nullptr, defaultConcat3.is() ? defaultConcat3.as() : nullptr, maxInputLength); } static int LUA_NATIVE_MISC_UPDATE_ONSCREEN_KEYBOARD() @@ -1898,6 +1898,17 @@ namespace lua::native return retval; } + static void LUA_NATIVE_MISC_SET_CONTENT_PROP_TYPE_(Hash model, int type) + { + MISC::_SET_CONTENT_PROP_TYPE(model, type); + } + + static int LUA_NATIVE_MISC_GET_CONTENT_PROP_TYPE_(Hash model) + { + auto retval = MISC::_GET_CONTENT_PROP_TYPE(model); + return retval; + } + void init_native_binding_MISC(sol::state& L) { auto MISC = L["MISC"].get_or_create(); @@ -2232,5 +2243,7 @@ namespace lua::native MISC.set_function("USE_ACTIVE_CAMERA_FOR_TIMESLICING_CENTRE", LUA_NATIVE_MISC_USE_ACTIVE_CAMERA_FOR_TIMESLICING_CENTRE); MISC.set_function("SET_CONTENT_ID_INDEX", LUA_NATIVE_MISC_SET_CONTENT_ID_INDEX); MISC.set_function("GET_CONTENT_ID_INDEX", LUA_NATIVE_MISC_GET_CONTENT_ID_INDEX); + MISC.set_function("SET_CONTENT_PROP_TYPE_", LUA_NATIVE_MISC_SET_CONTENT_PROP_TYPE_); + MISC.set_function("GET_CONTENT_PROP_TYPE_", LUA_NATIVE_MISC_GET_CONTENT_PROP_TYPE_); } } diff --git a/src/lua/natives/lua_native_binding_MONEY.cpp b/src/lua/natives/lua_native_binding_MONEY.cpp index 857f7b9f..50657299 100644 --- a/src/lua/natives/lua_native_binding_MONEY.cpp +++ b/src/lua/natives/lua_native_binding_MONEY.cpp @@ -47,14 +47,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_MONEY_NETWORK_REFUND_CASH(int index, const char* context, const char* reason, bool p3) + static void LUA_NATIVE_MONEY_NETWORK_REFUND_CASH(int index, sol::stack_object context, sol::stack_object reason, bool p3) { - MONEY::NETWORK_REFUND_CASH(index, context, reason, p3); + MONEY::NETWORK_REFUND_CASH(index, context.is() ? context.as() : nullptr, reason.is() ? reason.as() : nullptr, p3); } - static void LUA_NATIVE_MONEY_NETWORK_DEDUCT_CASH(int amount, const char* p1, const char* p2, bool p3, bool p4, bool p5) + static void LUA_NATIVE_MONEY_NETWORK_DEDUCT_CASH(int amount, sol::stack_object p1, sol::stack_object p2, bool p3, bool p4, bool p5) { - MONEY::NETWORK_DEDUCT_CASH(amount, p1, p2, p3, p4, p5); + MONEY::NETWORK_DEDUCT_CASH(amount, p1.is() ? p1.as() : nullptr, p2.is() ? p2.as() : nullptr, p3, p4, p5); } static bool LUA_NATIVE_MONEY_NETWORK_MONEY_CAN_BET(int amount, bool p1, bool p2) @@ -149,29 +149,29 @@ namespace lua::native MONEY::NETWORK_EARN_FROM_CRATE_DROP(amount); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_BETTING(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_BETTING(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_FROM_BETTING(amount, p1); + MONEY::NETWORK_EARN_FROM_BETTING(amount, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_JOB(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_JOB(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_FROM_JOB(amount, p1); + MONEY::NETWORK_EARN_FROM_JOB(amount, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_JOBX2(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_JOBX2(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_FROM_JOBX2(amount, p1); + MONEY::NETWORK_EARN_FROM_JOBX2(amount, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_PREMIUM_JOB(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_PREMIUM_JOB(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_FROM_PREMIUM_JOB(amount, p1); + MONEY::NETWORK_EARN_FROM_PREMIUM_JOB(amount, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_BEND_JOB(int amount, const char* heistHash) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_BEND_JOB(int amount, sol::stack_object heistHash) { - MONEY::NETWORK_EARN_FROM_BEND_JOB(amount, heistHash); + MONEY::NETWORK_EARN_FROM_BEND_JOB(amount, heistHash.is() ? heistHash.as() : nullptr); } static Any LUA_NATIVE_MONEY_NETWORK_EARN_FROM_CHALLENGE_WIN(Any p0, Any p1, bool p2) @@ -225,14 +225,14 @@ namespace lua::native MONEY::NETWORK_EARN_FROM_PERSONAL_VEHICLE(p0, p1, p2, p3, p4, p5, p6, p7, p8); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_DAILY_OBJECTIVES(int amount, const char* type, int characterSlot) + static void LUA_NATIVE_MONEY_NETWORK_EARN_FROM_DAILY_OBJECTIVES(int amount, sol::stack_object type, int characterSlot) { - MONEY::NETWORK_EARN_FROM_DAILY_OBJECTIVES(amount, type, characterSlot); + MONEY::NETWORK_EARN_FROM_DAILY_OBJECTIVES(amount, type.is() ? type.as() : nullptr, characterSlot); } - static Any LUA_NATIVE_MONEY_NETWORK_EARN_FROM_AMBIENT_JOB(int p0, const char* p1, Any p2) + static Any LUA_NATIVE_MONEY_NETWORK_EARN_FROM_AMBIENT_JOB(int p0, sol::stack_object p1, Any p2) { - MONEY::NETWORK_EARN_FROM_AMBIENT_JOB(p0, p1, &p2); + MONEY::NETWORK_EARN_FROM_AMBIENT_JOB(p0, p1.is() ? p1.as() : nullptr, &p2); return p2; } @@ -371,9 +371,9 @@ namespace lua::native return return_values; } - static void LUA_NATIVE_MONEY_NETWORK_BUY_ITEM(int amount, Hash item, Any p2, Any p3, bool p4, const char* item_name, Any p6, Any p7, Any p8, bool p9) + static void LUA_NATIVE_MONEY_NETWORK_BUY_ITEM(int amount, Hash item, Any p2, Any p3, bool p4, sol::stack_object item_name, Any p6, Any p7, Any p8, bool p9) { - MONEY::NETWORK_BUY_ITEM(amount, item, p2, p3, p4, item_name, p6, p7, p8, p9); + MONEY::NETWORK_BUY_ITEM(amount, item, p2, p3, p4, item_name.is() ? item_name.as() : nullptr, p6, p7, p8, p9); } static void LUA_NATIVE_MONEY_NETWORK_SPENT_TAXI(int amount, bool p1, bool p2, Any p3, Any p4) @@ -386,14 +386,14 @@ namespace lua::native MONEY::NETWORK_PAY_EMPLOYEE_WAGE(p0, p1, p2); } - static void LUA_NATIVE_MONEY_NETWORK_PAY_MATCH_ENTRY_FEE(int amount, const char* matchId, bool p2, bool p3) + static void LUA_NATIVE_MONEY_NETWORK_PAY_MATCH_ENTRY_FEE(int amount, sol::stack_object matchId, bool p2, bool p3) { - MONEY::NETWORK_PAY_MATCH_ENTRY_FEE(amount, matchId, p2, p3); + MONEY::NETWORK_PAY_MATCH_ENTRY_FEE(amount, matchId.is() ? matchId.as() : nullptr, p2, p3); } - static void LUA_NATIVE_MONEY_NETWORK_SPENT_BETTING(int amount, int p1, const char* matchId, bool p3, bool p4) + static void LUA_NATIVE_MONEY_NETWORK_SPENT_BETTING(int amount, int p1, sol::stack_object matchId, bool p3, bool p4) { - MONEY::NETWORK_SPENT_BETTING(amount, p1, matchId, p3, p4); + MONEY::NETWORK_SPENT_BETTING(amount, p1, matchId.is() ? matchId.as() : nullptr, p3, p4); } static void LUA_NATIVE_MONEY_NETWORK_SPENT_WAGER(Any p0, Any p1, int amount) @@ -565,10 +565,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_MONEY_PROCESS_CASH_GIFT(int p0, int p1, const char* p2) + static std::tuple LUA_NATIVE_MONEY_PROCESS_CASH_GIFT(int p0, int p1, sol::stack_object p2) { std::tuple return_values; - std::get<0>(return_values) = MONEY::PROCESS_CASH_GIFT(&p0, &p1, p2); + std::get<0>(return_values) = MONEY::PROCESS_CASH_GIFT(&p0, &p1, p2.is() ? p2.as() : nullptr); std::get<1>(return_values) = p0; std::get<2>(return_values) = p1; @@ -616,9 +616,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_MONEY_NETWORK_SPENT_JOB_SKIP(int amount, const char* matchId, bool p2, bool p3) + static void LUA_NATIVE_MONEY_NETWORK_SPENT_JOB_SKIP(int amount, sol::stack_object matchId, bool p2, bool p3) { - MONEY::NETWORK_SPENT_JOB_SKIP(amount, matchId, p2, p3); + MONEY::NETWORK_SPENT_JOB_SKIP(amount, matchId.is() ? matchId.as() : nullptr, p2, p3); } static bool LUA_NATIVE_MONEY_NETWORK_SPENT_BOSS_GOON(int amount, bool p1, bool p2) @@ -928,14 +928,14 @@ namespace lua::native MONEY::NETWORK_EARN_DOOMSDAY_FINALE_BONUS(amount, vehicleHash); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_AWARD(int amount, const char* p1, Any p2) + static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_AWARD(int amount, sol::stack_object p1, Any p2) { - MONEY::NETWORK_EARN_GANGOPS_AWARD(amount, p1, p2); + MONEY::NETWORK_EARN_GANGOPS_AWARD(amount, p1.is() ? p1.as() : nullptr, p2); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_ELITE(int amount, const char* p1, int actIndex) + static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_ELITE(int amount, sol::stack_object p1, int actIndex) { - MONEY::NETWORK_EARN_GANGOPS_ELITE(amount, p1, actIndex); + MONEY::NETWORK_EARN_GANGOPS_ELITE(amount, p1.is() ? p1.as() : nullptr, actIndex); } static void LUA_NATIVE_MONEY_NETWORK_SERVICE_EARN_GANGOPS_RIVAL_DELIVERY(int earnedMoney) @@ -958,14 +958,14 @@ namespace lua::native MONEY::NETWORK_EARN_GANGOPS_PREP_PARTICIPATION(amount); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_SETUP(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_SETUP(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_GANGOPS_SETUP(amount, p1); + MONEY::NETWORK_EARN_GANGOPS_SETUP(amount, p1.is() ? p1.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_FINALE(int amount, const char* p1) + static void LUA_NATIVE_MONEY_NETWORK_EARN_GANGOPS_FINALE(int amount, sol::stack_object p1) { - MONEY::NETWORK_EARN_GANGOPS_FINALE(amount, p1); + MONEY::NETWORK_EARN_GANGOPS_FINALE(amount, p1.is() ? p1.as() : nullptr); } static void LUA_NATIVE_MONEY_NETWORK_SPEND_GANGOPS_REPAIR_COST(Any p0, Any p1, Any p2) @@ -1068,14 +1068,14 @@ namespace lua::native MONEY::NETWORK_SPEND_MAKE_IT_RAIN(amount, p1, p2); } - static void LUA_NATIVE_MONEY_NETWORK_SPEND_BUY_ARENA(int amount, bool p1, bool p2, const char* p3) + static void LUA_NATIVE_MONEY_NETWORK_SPEND_BUY_ARENA(int amount, bool p1, bool p2, sol::stack_object p3) { - MONEY::NETWORK_SPEND_BUY_ARENA(amount, p1, p2, p3); + MONEY::NETWORK_SPEND_BUY_ARENA(amount, p1, p2, p3.is() ? p3.as() : nullptr); } - static void LUA_NATIVE_MONEY_NETWORK_SPEND_UPGRADE_ARENA(int amount, bool p1, bool p2, const char* p3) + static void LUA_NATIVE_MONEY_NETWORK_SPEND_UPGRADE_ARENA(int amount, bool p1, bool p2, sol::stack_object p3) { - MONEY::NETWORK_SPEND_UPGRADE_ARENA(amount, p1, p2, p3); + MONEY::NETWORK_SPEND_UPGRADE_ARENA(amount, p1, p2, p3.is() ? p3.as() : nullptr); } static void LUA_NATIVE_MONEY_NETWORK_SPEND_ARENA_SPECTATOR_BOX(int amount, int type, bool p2, bool p3) @@ -1721,6 +1721,23 @@ namespace lua::native MONEY::_NETWORK_SPENT_MISSILE_JAMMER(amount, fromBank, fromBankAndWallet, p3); } + static Any LUA_NATIVE_MONEY_NETWORK_SPENT_GENERIC_(int price, bool p1, bool p2, Hash stat, Hash spent, sol::stack_object p5, sol::stack_object p6, Any data) + { + MONEY::_NETWORK_SPENT_GENERIC(price, p1, p2, stat, spent, p5.is() ? p5.as() : nullptr, p6.is() ? p6.as() : nullptr, &data); + return data; + } + + static Any LUA_NATIVE_MONEY_NETWORK_EARN_GENERIC_(int amount, Hash earn, sol::stack_object p2, sol::stack_object p3, Any data) + { + MONEY::_NETWORK_EARN_GENERIC(amount, earn, p2.is() ? p2.as() : nullptr, p3.is() ? p3.as() : nullptr, &data); + return data; + } + + static void LUA_NATIVE_MONEY_NETWORK_CLEAR_TRANSACTION_TELEMETRY_NONCE_() + { + MONEY::_NETWORK_CLEAR_TRANSACTION_TELEMETRY_NONCE(); + } + static int LUA_NATIVE_MONEY_NETWORK_GET_VC_BANK_BALANCE() { auto retval = MONEY::NETWORK_GET_VC_BANK_BALANCE(); @@ -2172,6 +2189,9 @@ namespace lua::native MONEY.set_function("NETWORK_SPENT_SKIP_CARGO_SOURCE_SETUP_", LUA_NATIVE_MONEY_NETWORK_SPENT_SKIP_CARGO_SOURCE_SETUP_); MONEY.set_function("NETWORK_SPENT_STEALTH_MODULE_", LUA_NATIVE_MONEY_NETWORK_SPENT_STEALTH_MODULE_); MONEY.set_function("NETWORK_SPENT_MISSILE_JAMMER_", LUA_NATIVE_MONEY_NETWORK_SPENT_MISSILE_JAMMER_); + MONEY.set_function("NETWORK_SPENT_GENERIC_", LUA_NATIVE_MONEY_NETWORK_SPENT_GENERIC_); + MONEY.set_function("NETWORK_EARN_GENERIC_", LUA_NATIVE_MONEY_NETWORK_EARN_GENERIC_); + MONEY.set_function("NETWORK_CLEAR_TRANSACTION_TELEMETRY_NONCE_", LUA_NATIVE_MONEY_NETWORK_CLEAR_TRANSACTION_TELEMETRY_NONCE_); MONEY.set_function("NETWORK_GET_VC_BANK_BALANCE", LUA_NATIVE_MONEY_NETWORK_GET_VC_BANK_BALANCE); MONEY.set_function("NETWORK_GET_VC_WALLET_BALANCE", LUA_NATIVE_MONEY_NETWORK_GET_VC_WALLET_BALANCE); MONEY.set_function("NETWORK_GET_VC_BALANCE", LUA_NATIVE_MONEY_NETWORK_GET_VC_BALANCE); diff --git a/src/lua/natives/lua_native_binding_NETSHOPPING.cpp b/src/lua/natives/lua_native_binding_NETSHOPPING.cpp index e9dde5eb..54444df4 100644 --- a/src/lua/natives/lua_native_binding_NETSHOPPING.cpp +++ b/src/lua/natives/lua_native_binding_NETSHOPPING.cpp @@ -9,9 +9,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETSHOPPING_NET_GAMESERVER_CATALOG_ITEM_IS_VALID(const char* name) + static bool LUA_NATIVE_NETSHOPPING_NET_GAMESERVER_CATALOG_ITEM_IS_VALID(sol::stack_object name) { - auto retval = (bool)NETSHOPPING::NET_GAMESERVER_CATALOG_ITEM_IS_VALID(name); + auto retval = (bool)NETSHOPPING::NET_GAMESERVER_CATALOG_ITEM_IS_VALID(name.is() ? name.as() : nullptr); return retval; } diff --git a/src/lua/natives/lua_native_binding_NETWORK.cpp b/src/lua/natives/lua_native_binding_NETWORK.cpp index c5a78d65..a4288770 100644 --- a/src/lua/natives/lua_native_binding_NETWORK.cpp +++ b/src/lua/natives/lua_native_binding_NETWORK.cpp @@ -123,6 +123,12 @@ namespace lua::native return retval; } + static bool LUA_NATIVE_NETWORK_NETWORK_HAVE_PLATFORM_COMMUNICATION_PRIVILEGES_() + { + auto retval = (bool)NETWORK::_NETWORK_HAVE_PLATFORM_COMMUNICATION_PRIVILEGES(); + return retval; + } + static bool LUA_NATIVE_NETWORK_NETWORK_CHECK_ONLINE_PRIVILEGES(Any p0, bool p1) { auto retval = (bool)NETWORK::NETWORK_CHECK_ONLINE_PRIVILEGES(p0, p1); @@ -344,6 +350,12 @@ namespace lua::native return retval; } + static bool LUA_NATIVE_NETWORK_NETWORK_SESSION_LEAVE_INCLUDING_REASON_(int leaveFlags, int leaveReason) + { + auto retval = (bool)NETWORK::_NETWORK_SESSION_LEAVE_INCLUDING_REASON(leaveFlags, leaveReason); + return retval; + } + static bool LUA_NATIVE_NETWORK_NETWORK_SESSION_END(bool p0, bool p1) { auto retval = (bool)NETWORK::NETWORK_SESSION_END(p0, p1); @@ -411,6 +423,12 @@ namespace lua::native NETWORK::NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT(p0); } + static int LUA_NATIVE_NETWORK_NETWORK_SESSION_GET_UNIQUE_CREW_LIMIT() + { + auto retval = NETWORK::NETWORK_SESSION_GET_UNIQUE_CREW_LIMIT(); + return retval; + } + static void LUA_NATIVE_NETWORK_NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT_TRANSITION(Any p0) { NETWORK::NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT_TRANSITION(p0); @@ -700,6 +718,12 @@ namespace lua::native return retval; } + static bool LUA_NATIVE_NETWORK_NETWORK_IS_AMERICAS_VERSION_() + { + auto retval = (bool)NETWORK::_NETWORK_IS_AMERICAS_VERSION(); + return retval; + } + static bool LUA_NATIVE_NETWORK_NETWORK_IS_SESSION_STARTED() { auto retval = (bool)NETWORK::NETWORK_IS_SESSION_STARTED(); @@ -797,10 +821,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TEXT_MESSAGE(const char* message, Any gamerHandle) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TEXT_MESSAGE(sol::stack_object message, Any gamerHandle) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TEXT_MESSAGE(message, &gamerHandle); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TEXT_MESSAGE(message.is() ? message.as() : nullptr, &gamerHandle); std::get<1>(return_values) = gamerHandle; return return_values; @@ -1033,15 +1057,15 @@ namespace lua::native NETWORK::NETWORK_APPLY_TRANSITION_PARAMETER(p0, p1); } - static void LUA_NATIVE_NETWORK_NETWORK_APPLY_TRANSITION_PARAMETER_STRING(int p0, const char* string, bool p2) + static void LUA_NATIVE_NETWORK_NETWORK_APPLY_TRANSITION_PARAMETER_STRING(int p0, sol::stack_object string, bool p2) { - NETWORK::NETWORK_APPLY_TRANSITION_PARAMETER_STRING(p0, string, p2); + NETWORK::NETWORK_APPLY_TRANSITION_PARAMETER_STRING(p0, string.is() ? string.as() : nullptr, p2); } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TRANSITION_GAMER_INSTRUCTION(Any gamerHandle, const char* p1, int p2, int p3, bool p4) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TRANSITION_GAMER_INSTRUCTION(Any gamerHandle, sol::stack_object p1, int p2, int p3, bool p4) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TRANSITION_GAMER_INSTRUCTION(&gamerHandle, p1, p2, p3, p4); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TRANSITION_GAMER_INSTRUCTION(&gamerHandle, p1.is() ? p1.as() : nullptr, p2, p3, p4); std::get<1>(return_values) = gamerHandle; return return_values; @@ -1219,28 +1243,28 @@ namespace lua::native NETWORK::NETWORK_SET_PRESENCE_SESSION_INVITES_BLOCKED(toggle); } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_INVITE_VIA_PRESENCE(Any gamerHandle, const char* p1, int dataCount, int p3) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_INVITE_VIA_PRESENCE(Any gamerHandle, sol::stack_object p1, int dataCount, int p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_INVITE_VIA_PRESENCE(&gamerHandle, p1, dataCount, p3); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_INVITE_VIA_PRESENCE(&gamerHandle, p1.is() ? p1.as() : nullptr, dataCount, p3); std::get<1>(return_values) = gamerHandle; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TRANSITION_INVITE_VIA_PRESENCE(Any gamerHandle, const char* p1, int dataCount, int p3) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_TRANSITION_INVITE_VIA_PRESENCE(Any gamerHandle, sol::stack_object p1, int dataCount, int p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TRANSITION_INVITE_VIA_PRESENCE(&gamerHandle, p1, dataCount, p3); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_TRANSITION_INVITE_VIA_PRESENCE(&gamerHandle, p1.is() ? p1.as() : nullptr, dataCount, p3); std::get<1>(return_values) = gamerHandle; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_IMPORTANT_TRANSITION_INVITE_VIA_PRESENCE(Any gamerHandle, const char* p1, int dataCount, int p3) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_SEND_IMPORTANT_TRANSITION_INVITE_VIA_PRESENCE(Any gamerHandle, sol::stack_object p1, int dataCount, int p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_IMPORTANT_TRANSITION_INVITE_VIA_PRESENCE(&gamerHandle, p1, dataCount, p3); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_SEND_IMPORTANT_TRANSITION_INVITE_VIA_PRESENCE(&gamerHandle, p1.is() ? p1.as() : nullptr, dataCount, p3); std::get<1>(return_values) = gamerHandle; return return_values; @@ -1660,15 +1684,15 @@ namespace lua::native return retval; } - static int LUA_NATIVE_NETWORK_NETWORK_REGISTER_HOST_BROADCAST_VARIABLES(int vars, int numVars, const char* debugName) + static int LUA_NATIVE_NETWORK_NETWORK_REGISTER_HOST_BROADCAST_VARIABLES(int vars, int numVars, sol::stack_object debugName) { - NETWORK::NETWORK_REGISTER_HOST_BROADCAST_VARIABLES(&vars, numVars, debugName); + NETWORK::NETWORK_REGISTER_HOST_BROADCAST_VARIABLES(&vars, numVars, debugName.is() ? debugName.as() : nullptr); return vars; } - static int LUA_NATIVE_NETWORK_NETWORK_REGISTER_PLAYER_BROADCAST_VARIABLES(int vars, int numVars, const char* debugName) + static int LUA_NATIVE_NETWORK_NETWORK_REGISTER_PLAYER_BROADCAST_VARIABLES(int vars, int numVars, sol::stack_object debugName) { - NETWORK::NETWORK_REGISTER_PLAYER_BROADCAST_VARIABLES(&vars, numVars, debugName); + NETWORK::NETWORK_REGISTER_PLAYER_BROADCAST_VARIABLES(&vars, numVars, debugName.is() ? debugName.as() : nullptr); return vars; } @@ -1759,9 +1783,9 @@ namespace lua::native return retval; } - static Player LUA_NATIVE_NETWORK_NETWORK_GET_HOST_OF_SCRIPT(const char* scriptName, int instance_id, int position_hash) + static Player LUA_NATIVE_NETWORK_NETWORK_GET_HOST_OF_SCRIPT(sol::stack_object scriptName, int instance_id, int position_hash) { - auto retval = NETWORK::NETWORK_GET_HOST_OF_SCRIPT(scriptName, instance_id, position_hash); + auto retval = NETWORK::NETWORK_GET_HOST_OF_SCRIPT(scriptName.is() ? scriptName.as() : nullptr, instance_id, position_hash); return retval; } @@ -1770,9 +1794,9 @@ namespace lua::native NETWORK::NETWORK_SET_MISSION_FINISHED(); } - static bool LUA_NATIVE_NETWORK_NETWORK_IS_SCRIPT_ACTIVE(const char* scriptName, int instance_id, bool p2, int position_hash) + static bool LUA_NATIVE_NETWORK_NETWORK_IS_SCRIPT_ACTIVE(sol::stack_object scriptName, int instance_id, bool p2, int position_hash) { - auto retval = (bool)NETWORK::NETWORK_IS_SCRIPT_ACTIVE(scriptName, instance_id, p2, position_hash); + auto retval = (bool)NETWORK::NETWORK_IS_SCRIPT_ACTIVE(scriptName.is() ? scriptName.as() : nullptr, instance_id, p2, position_hash); return retval; } @@ -1788,9 +1812,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_NETWORK_NETWORK_GET_NUM_SCRIPT_PARTICIPANTS(const char* scriptName, int instance_id, int position_hash) + static int LUA_NATIVE_NETWORK_NETWORK_GET_NUM_SCRIPT_PARTICIPANTS(sol::stack_object scriptName, int instance_id, int position_hash) { - auto retval = NETWORK::NETWORK_GET_NUM_SCRIPT_PARTICIPANTS(scriptName, instance_id, position_hash); + auto retval = NETWORK::NETWORK_GET_NUM_SCRIPT_PARTICIPANTS(scriptName.is() ? scriptName.as() : nullptr, instance_id, position_hash); return retval; } @@ -1806,9 +1830,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_IS_PLAYER_A_PARTICIPANT_ON_SCRIPT(Player player, const char* script, int instance_id) + static bool LUA_NATIVE_NETWORK_NETWORK_IS_PLAYER_A_PARTICIPANT_ON_SCRIPT(Player player, sol::stack_object script, int instance_id) { - auto retval = (bool)NETWORK::NETWORK_IS_PLAYER_A_PARTICIPANT_ON_SCRIPT(player, script, instance_id); + auto retval = (bool)NETWORK::NETWORK_IS_PLAYER_A_PARTICIPANT_ON_SCRIPT(player, script.is() ? script.as() : nullptr, instance_id); return retval; } @@ -1888,9 +1912,9 @@ namespace lua::native return return_values; } - static void LUA_NATIVE_NETWORK_NETWORK_SET_CURRENT_PUBLIC_CONTENT_ID(const char* missionId) + static void LUA_NATIVE_NETWORK_NETWORK_SET_CURRENT_PUBLIC_CONTENT_ID(sol::stack_object missionId) { - NETWORK::NETWORK_SET_CURRENT_PUBLIC_CONTENT_ID(missionId); + NETWORK::NETWORK_SET_CURRENT_PUBLIC_CONTENT_ID(missionId.is() ? missionId.as() : nullptr); } static void LUA_NATIVE_NETWORK_NETWORK_SET_CURRENT_CHAT_OPTION(int newChatOption) @@ -2098,15 +2122,15 @@ namespace lua::native return gamerHandle; } - static Any LUA_NATIVE_NETWORK_NETWORK_HANDLE_FROM_USER_ID(const char* userId, Any gamerHandle, int gamerHandleSize) + static Any LUA_NATIVE_NETWORK_NETWORK_HANDLE_FROM_USER_ID(sol::stack_object userId, Any gamerHandle, int gamerHandleSize) { - NETWORK::NETWORK_HANDLE_FROM_USER_ID(userId, &gamerHandle, gamerHandleSize); + NETWORK::NETWORK_HANDLE_FROM_USER_ID(userId.is() ? userId.as() : nullptr, &gamerHandle, gamerHandleSize); return gamerHandle; } - static Any LUA_NATIVE_NETWORK_NETWORK_HANDLE_FROM_MEMBER_ID(const char* memberId, Any gamerHandle, int gamerHandleSize) + static Any LUA_NATIVE_NETWORK_NETWORK_HANDLE_FROM_MEMBER_ID(sol::stack_object memberId, Any gamerHandle, int gamerHandleSize) { - NETWORK::NETWORK_HANDLE_FROM_MEMBER_ID(memberId, &gamerHandle, gamerHandleSize); + NETWORK::NETWORK_HANDLE_FROM_MEMBER_ID(memberId.is() ? memberId.as() : nullptr, &gamerHandle, gamerHandleSize); return gamerHandle; } @@ -2306,9 +2330,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_ONLINE(const char* name) + static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_ONLINE(sol::stack_object name) { - auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_ONLINE(name); + auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_ONLINE(name.is() ? name.as() : nullptr); return retval; } @@ -2321,15 +2345,15 @@ namespace lua::native return return_values; } - static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_IN_SAME_TITLE(const char* friendName) + static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_IN_SAME_TITLE(sol::stack_object friendName) { - auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_IN_SAME_TITLE(friendName); + auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_IN_SAME_TITLE(friendName.is() ? friendName.as() : nullptr); return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_IN_MULTIPLAYER(const char* friendName) + static bool LUA_NATIVE_NETWORK_NETWORK_IS_FRIEND_IN_MULTIPLAYER(sol::stack_object friendName) { - auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_IN_MULTIPLAYER(friendName); + auto retval = (bool)NETWORK::NETWORK_IS_FRIEND_IN_MULTIPLAYER(friendName.is() ? friendName.as() : nullptr); return retval; } @@ -2354,10 +2378,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_ADD_FRIEND(Any gamerHandle, const char* message) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_ADD_FRIEND(Any gamerHandle, sol::stack_object message) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_ADD_FRIEND(&gamerHandle, message); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_ADD_FRIEND(&gamerHandle, message.is() ? message.as() : nullptr); std::get<1>(return_values) = gamerHandle; return return_values; @@ -2391,6 +2415,23 @@ namespace lua::native NETWORK::NETWORK_IGNORE_REMOTE_WAYPOINTS(); } + static bool LUA_NATIVE_NETWORK_NETWORK_DOES_COMMUNICATION_GROUP_EXIST_(int communicationType) + { + auto retval = (bool)NETWORK::_NETWORK_DOES_COMMUNICATION_GROUP_EXIST(communicationType); + return retval; + } + + static int LUA_NATIVE_NETWORK_NETWORK_GET_COMMUNICATION_GROUP_FLAGS_(int communicationType) + { + auto retval = NETWORK::_NETWORK_GET_COMMUNICATION_GROUP_FLAGS(communicationType); + return retval; + } + + static void LUA_NATIVE_NETWORK_NETWORK_SET_COMMUNICATION_GROUP_FLAGS_(int communicationType, int communicationGroupFlag) + { + NETWORK::_NETWORK_SET_COMMUNICATION_GROUP_FLAGS(communicationType, communicationGroupFlag); + } + static std::tuple LUA_NATIVE_NETWORK_NETWORK_IS_PLAYER_ON_BLOCKLIST(Any gamerHandle) { std::tuple return_values; @@ -2775,9 +2816,9 @@ namespace lua::native NETWORK::NETWORK_SET_RICH_PRESENCE(p0, p1, p2, p3); } - static void LUA_NATIVE_NETWORK_NETWORK_SET_RICH_PRESENCE_STRING(int p0, const char* textLabel) + static void LUA_NATIVE_NETWORK_NETWORK_SET_RICH_PRESENCE_STRING(int p0, sol::stack_object textLabel) { - NETWORK::NETWORK_SET_RICH_PRESENCE_STRING(p0, textLabel); + NETWORK::NETWORK_SET_RICH_PRESENCE_STRING(p0, textLabel.is() ? textLabel.as() : nullptr); } static int LUA_NATIVE_NETWORK_NETWORK_GET_TIMEOUT_TIME() @@ -2938,15 +2979,15 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_CLAN_CREWINFO_GET_STRING_VALUE(const char* animDict, const char* animName) + static bool LUA_NATIVE_NETWORK_NETWORK_CLAN_CREWINFO_GET_STRING_VALUE(sol::stack_object animDict, sol::stack_object animName) { - auto retval = (bool)NETWORK::NETWORK_CLAN_CREWINFO_GET_STRING_VALUE(animDict, animName); + auto retval = (bool)NETWORK::NETWORK_CLAN_CREWINFO_GET_STRING_VALUE(animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_CLAN_CREWINFO_GET_CREWRANKTITLE(int p0, const char* p1) + static bool LUA_NATIVE_NETWORK_NETWORK_CLAN_CREWINFO_GET_CREWRANKTITLE(int p0, sol::stack_object p1) { - auto retval = (bool)NETWORK::NETWORK_CLAN_CREWINFO_GET_CREWRANKTITLE(p0, p1); + auto retval = (bool)NETWORK::NETWORK_CLAN_CREWINFO_GET_CREWRANKTITLE(p0, p1.is() ? p1.as() : nullptr); return retval; } @@ -3568,9 +3609,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_NETWORK_NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE(Ped ped, int netScene, const char* animDict, const char* animnName, float speed, float speedMultiplier, int duration, int flag, float playbackRate, Any p9) + static void LUA_NATIVE_NETWORK_NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE(Ped ped, int netScene, sol::stack_object animDict, sol::stack_object animnName, float speed, float speedMultiplier, int duration, int flag, float playbackRate, Any p9) { - NETWORK::NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE(ped, netScene, animDict, animnName, speed, speedMultiplier, duration, flag, playbackRate, p9); + NETWORK::NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE(ped, netScene, animDict.is() ? animDict.as() : nullptr, animnName.is() ? animnName.as() : nullptr, speed, speedMultiplier, duration, flag, playbackRate, p9); } static void LUA_NATIVE_NETWORK_NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE_WITH_IK(Any p0, Any p1, Any p2, Any p3, Any p4, Any p5, Any p6, Any p7, Any p8, Any p9) @@ -3578,19 +3619,19 @@ namespace lua::native NETWORK::NETWORK_ADD_PED_TO_SYNCHRONISED_SCENE_WITH_IK(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); } - static void LUA_NATIVE_NETWORK_NETWORK_ADD_ENTITY_TO_SYNCHRONISED_SCENE(Entity entity, int netScene, const char* animDict, const char* animName, float speed, float speedMulitiplier, int flag) + static void LUA_NATIVE_NETWORK_NETWORK_ADD_ENTITY_TO_SYNCHRONISED_SCENE(Entity entity, int netScene, sol::stack_object animDict, sol::stack_object animName, float speed, float speedMulitiplier, int flag) { - NETWORK::NETWORK_ADD_ENTITY_TO_SYNCHRONISED_SCENE(entity, netScene, animDict, animName, speed, speedMulitiplier, flag); + NETWORK::NETWORK_ADD_ENTITY_TO_SYNCHRONISED_SCENE(entity, netScene, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, speed, speedMulitiplier, flag); } - static void LUA_NATIVE_NETWORK_NETWORK_ADD_MAP_ENTITY_TO_SYNCHRONISED_SCENE(int netScene, Hash modelHash, float x, float y, float z, float p5, const char* p6, float p7, float p8, int flags) + static void LUA_NATIVE_NETWORK_NETWORK_ADD_MAP_ENTITY_TO_SYNCHRONISED_SCENE(int netScene, Hash modelHash, float x, float y, float z, float p5, sol::stack_object p6, float p7, float p8, int flags) { - NETWORK::NETWORK_ADD_MAP_ENTITY_TO_SYNCHRONISED_SCENE(netScene, modelHash, x, y, z, p5, p6, p7, p8, flags); + NETWORK::NETWORK_ADD_MAP_ENTITY_TO_SYNCHRONISED_SCENE(netScene, modelHash, x, y, z, p5, p6.is() ? p6.as() : nullptr, p7, p8, flags); } - static void LUA_NATIVE_NETWORK_NETWORK_ADD_SYNCHRONISED_SCENE_CAMERA(int netScene, const char* animDict, const char* animName) + static void LUA_NATIVE_NETWORK_NETWORK_ADD_SYNCHRONISED_SCENE_CAMERA(int netScene, sol::stack_object animDict, sol::stack_object animName) { - NETWORK::NETWORK_ADD_SYNCHRONISED_SCENE_CAMERA(netScene, animDict, animName); + NETWORK::NETWORK_ADD_SYNCHRONISED_SCENE_CAMERA(netScene, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); } static void LUA_NATIVE_NETWORK_NETWORK_ATTACH_SYNCHRONISED_SCENE_TO_ENTITY(int netScene, Entity entity, int bone) @@ -3857,33 +3898,33 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETWORK_NETWORK_DOES_TUNABLE_EXIST(const char* tunableContext, const char* tunableName) + static bool LUA_NATIVE_NETWORK_NETWORK_DOES_TUNABLE_EXIST(sol::stack_object tunableContext, sol::stack_object tunableName) { - auto retval = (bool)NETWORK::NETWORK_DOES_TUNABLE_EXIST(tunableContext, tunableName); + auto retval = (bool)NETWORK::NETWORK_DOES_TUNABLE_EXIST(tunableContext.is() ? tunableContext.as() : nullptr, tunableName.is() ? tunableName.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_INT(const char* tunableContext, const char* tunableName, int value) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_INT(sol::stack_object tunableContext, sol::stack_object tunableName, int value) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_INT(tunableContext, tunableName, &value); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_INT(tunableContext.is() ? tunableContext.as() : nullptr, tunableName.is() ? tunableName.as() : nullptr, &value); std::get<1>(return_values) = value; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_FLOAT(const char* tunableContext, const char* tunableName, float value) + static std::tuple LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_FLOAT(sol::stack_object tunableContext, sol::stack_object tunableName, float value) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_FLOAT(tunableContext, tunableName, &value); + std::get<0>(return_values) = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_FLOAT(tunableContext.is() ? tunableContext.as() : nullptr, tunableName.is() ? tunableName.as() : nullptr, &value); std::get<1>(return_values) = value; return return_values; } - static bool LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_BOOL(const char* tunableContext, const char* tunableName) + static bool LUA_NATIVE_NETWORK_NETWORK_ACCESS_TUNABLE_BOOL(sol::stack_object tunableContext, sol::stack_object tunableName) { - auto retval = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_BOOL(tunableContext, tunableName); + auto retval = (bool)NETWORK::NETWORK_ACCESS_TUNABLE_BOOL(tunableContext.is() ? tunableContext.as() : nullptr, tunableName.is() ? tunableName.as() : nullptr); return retval; } @@ -4127,9 +4168,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_NETWORK_OPEN_COMMERCE_STORE(const char* p0, const char* p1, int p2) + static void LUA_NATIVE_NETWORK_OPEN_COMMERCE_STORE(sol::stack_object p0, sol::stack_object p1, int p2) { - NETWORK::OPEN_COMMERCE_STORE(p0, p1, p2); + NETWORK::OPEN_COMMERCE_STORE(p0.is() ? p0.as() : nullptr, p1.is() ? p1.as() : nullptr, p2); } static bool LUA_NATIVE_NETWORK_IS_COMMERCE_STORE_OPEN() @@ -4199,9 +4240,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_NETWORK_CLOUD_DELETE_MEMBER_FILE(const char* p0) + static int LUA_NATIVE_NETWORK_CLOUD_DELETE_MEMBER_FILE(sol::stack_object p0) { - auto retval = NETWORK::CLOUD_DELETE_MEMBER_FILE(p0); + auto retval = NETWORK::CLOUD_DELETE_MEMBER_FILE(p0.is() ? p0.as() : nullptr); return retval; } @@ -4311,88 +4352,88 @@ namespace lua::native return return_values; } - static bool LUA_NATIVE_NETWORK_UGC_QUERY_BY_CATEGORY(Any p0, Any p1, Any p2, const char* p3, Any p4, bool p5) + static bool LUA_NATIVE_NETWORK_UGC_QUERY_BY_CATEGORY(Any p0, Any p1, Any p2, sol::stack_object p3, Any p4, bool p5) { - auto retval = (bool)NETWORK::UGC_QUERY_BY_CATEGORY(p0, p1, p2, p3, p4, p5); + auto retval = (bool)NETWORK::UGC_QUERY_BY_CATEGORY(p0, p1, p2, p3.is() ? p3.as() : nullptr, p4, p5); return retval; } - static bool LUA_NATIVE_NETWORK_UGC_QUERY_BY_CONTENT_ID(const char* contentId, bool latestVersion, const char* contentTypeName) + static bool LUA_NATIVE_NETWORK_UGC_QUERY_BY_CONTENT_ID(sol::stack_object contentId, bool latestVersion, sol::stack_object contentTypeName) { - auto retval = (bool)NETWORK::UGC_QUERY_BY_CONTENT_ID(contentId, latestVersion, contentTypeName); + auto retval = (bool)NETWORK::UGC_QUERY_BY_CONTENT_ID(contentId.is() ? contentId.as() : nullptr, latestVersion, contentTypeName.is() ? contentTypeName.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_NETWORK_UGC_QUERY_BY_CONTENT_IDS(Any data, int count, bool latestVersion, const char* contentTypeName) + static std::tuple LUA_NATIVE_NETWORK_UGC_QUERY_BY_CONTENT_IDS(Any data, int count, bool latestVersion, sol::stack_object contentTypeName) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_QUERY_BY_CONTENT_IDS(&data, count, latestVersion, contentTypeName); + std::get<0>(return_values) = (bool)NETWORK::UGC_QUERY_BY_CONTENT_IDS(&data, count, latestVersion, contentTypeName.is() ? contentTypeName.as() : nullptr); std::get<1>(return_values) = data; return return_values; } - static bool LUA_NATIVE_NETWORK_UGC_QUERY_MOST_RECENTLY_CREATED_CONTENT(int offset, int count, const char* contentTypeName, int p3) + static bool LUA_NATIVE_NETWORK_UGC_QUERY_MOST_RECENTLY_CREATED_CONTENT(int offset, int count, sol::stack_object contentTypeName, int p3) { - auto retval = (bool)NETWORK::UGC_QUERY_MOST_RECENTLY_CREATED_CONTENT(offset, count, contentTypeName, p3); + auto retval = (bool)NETWORK::UGC_QUERY_MOST_RECENTLY_CREATED_CONTENT(offset, count, contentTypeName.is() ? contentTypeName.as() : nullptr, p3); return retval; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_BOOKMARKED_CONTENT(Any p0, Any p1, const char* p2, Any p3) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_BOOKMARKED_CONTENT(Any p0, Any p1, sol::stack_object p2, Any p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_BOOKMARKED_CONTENT(p0, p1, p2, &p3); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_BOOKMARKED_CONTENT(p0, p1, p2.is() ? p2.as() : nullptr, &p3); std::get<1>(return_values) = p3; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_MY_CONTENT(Any p0, Any p1, const char* p2, Any p3) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_MY_CONTENT(Any p0, Any p1, sol::stack_object p2, Any p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_MY_CONTENT(p0, p1, p2, &p3); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_MY_CONTENT(p0, p1, p2.is() ? p2.as() : nullptr, &p3); std::get<1>(return_values) = p3; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_FRIEND_CONTENT(Any p0, Any p1, const char* p2, Any p3) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_FRIEND_CONTENT(Any p0, Any p1, sol::stack_object p2, Any p3) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_FRIEND_CONTENT(p0, p1, p2, &p3); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_FRIEND_CONTENT(p0, p1, p2.is() ? p2.as() : nullptr, &p3); std::get<1>(return_values) = p3; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_CREW_CONTENT(Any p0, Any p1, Any p2, const char* p3, Any p4) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_CREW_CONTENT(Any p0, Any p1, Any p2, sol::stack_object p3, Any p4) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_CREW_CONTENT(p0, p1, p2, p3, &p4); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_CREW_CONTENT(p0, p1, p2, p3.is() ? p3.as() : nullptr, &p4); std::get<1>(return_values) = p4; return return_values; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CATEGORY(Any p0, Any p1, Any p2, const char* p3, Any p4) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CATEGORY(Any p0, Any p1, Any p2, sol::stack_object p3, Any p4) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_GET_BY_CATEGORY(p0, p1, p2, p3, &p4); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_GET_BY_CATEGORY(p0, p1, p2, p3.is() ? p3.as() : nullptr, &p4); std::get<1>(return_values) = p4; return return_values; } - static bool LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CONTENT_ID(const char* contentId, const char* contentTypeName) + static bool LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CONTENT_ID(sol::stack_object contentId, sol::stack_object contentTypeName) { - auto retval = (bool)NETWORK::UGC_GET_GET_BY_CONTENT_ID(contentId, contentTypeName); + auto retval = (bool)NETWORK::UGC_GET_GET_BY_CONTENT_ID(contentId.is() ? contentId.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CONTENT_IDS(Any data, int dataCount, const char* contentTypeName) + static std::tuple LUA_NATIVE_NETWORK_UGC_GET_GET_BY_CONTENT_IDS(Any data, int dataCount, sol::stack_object contentTypeName) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_GET_GET_BY_CONTENT_IDS(&data, dataCount, contentTypeName); + std::get<0>(return_values) = (bool)NETWORK::UGC_GET_GET_BY_CONTENT_IDS(&data, dataCount, contentTypeName.is() ? contentTypeName.as() : nullptr); std::get<1>(return_values) = data; return return_values; @@ -4639,9 +4680,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_NETWORK_UGC_REQUEST_CONTENT_DATA_FROM_PARAMS(const char* contentTypeName, const char* contentId, int p2, int p3, int p4) + static int LUA_NATIVE_NETWORK_UGC_REQUEST_CONTENT_DATA_FROM_PARAMS(sol::stack_object contentTypeName, sol::stack_object contentId, int p2, int p3, int p4) { - auto retval = NETWORK::UGC_REQUEST_CONTENT_DATA_FROM_PARAMS(contentTypeName, contentId, p2, p3, p4); + auto retval = NETWORK::UGC_REQUEST_CONTENT_DATA_FROM_PARAMS(contentTypeName.is() ? contentTypeName.as() : nullptr, contentId.is() ? contentId.as() : nullptr, p2, p3, p4); return retval; } @@ -4686,22 +4727,28 @@ namespace lua::native NETWORK::UGC_RELEASE_ALL_CACHED_DESCRIPTIONS(); } - static bool LUA_NATIVE_NETWORK_UGC_PUBLISH(const char* contentId, const char* baseContentId, const char* contentTypeName) + static bool LUA_NATIVE_NETWORK_UGC_HAS_PERMISSION_TO_WRITE() { - auto retval = (bool)NETWORK::UGC_PUBLISH(contentId, baseContentId, contentTypeName); + auto retval = (bool)NETWORK::UGC_HAS_PERMISSION_TO_WRITE(); return retval; } - static bool LUA_NATIVE_NETWORK_UGC_SET_BOOKMARKED(const char* contentId, bool bookmarked, const char* contentTypeName) + static bool LUA_NATIVE_NETWORK_UGC_PUBLISH(sol::stack_object contentId, sol::stack_object baseContentId, sol::stack_object contentTypeName) { - auto retval = (bool)NETWORK::UGC_SET_BOOKMARKED(contentId, bookmarked, contentTypeName); + auto retval = (bool)NETWORK::UGC_PUBLISH(contentId.is() ? contentId.as() : nullptr, baseContentId.is() ? baseContentId.as() : nullptr, contentTypeName.is() ? contentTypeName.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_NETWORK_UGC_SET_DELETED(Any p0, bool p1, const char* p2) + static bool LUA_NATIVE_NETWORK_UGC_SET_BOOKMARKED(sol::stack_object contentId, bool bookmarked, sol::stack_object contentTypeName) + { + auto retval = (bool)NETWORK::UGC_SET_BOOKMARKED(contentId.is() ? contentId.as() : nullptr, bookmarked, contentTypeName.is() ? contentTypeName.as() : nullptr); + return retval; + } + + static std::tuple LUA_NATIVE_NETWORK_UGC_SET_DELETED(Any p0, bool p1, sol::stack_object p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)NETWORK::UGC_SET_DELETED(&p0, p1, p2); + std::get<0>(return_values) = (bool)NETWORK::UGC_SET_DELETED(&p0, p1, p2.is() ? p2.as() : nullptr); std::get<1>(return_values) = p0; return return_values; @@ -4791,9 +4838,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_NETWORK_FACEBOOK_POST_COMPLETED_HEIST(const char* heistName, int cashEarned, int xpEarned) + static bool LUA_NATIVE_NETWORK_FACEBOOK_POST_COMPLETED_HEIST(sol::stack_object heistName, int cashEarned, int xpEarned) { - auto retval = (bool)NETWORK::FACEBOOK_POST_COMPLETED_HEIST(heistName, cashEarned, xpEarned); + auto retval = (bool)NETWORK::FACEBOOK_POST_COMPLETED_HEIST(heistName.is() ? heistName.as() : nullptr, cashEarned, xpEarned); return retval; } @@ -4827,24 +4874,24 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_NETWORK_TEXTURE_DOWNLOAD_REQUEST(Any gamerHandle, const char* filePath, const char* name, bool p3) + static std::tuple LUA_NATIVE_NETWORK_TEXTURE_DOWNLOAD_REQUEST(Any gamerHandle, sol::stack_object filePath, sol::stack_object name, bool p3) { std::tuple return_values; - std::get<0>(return_values) = NETWORK::TEXTURE_DOWNLOAD_REQUEST(&gamerHandle, filePath, name, p3); + std::get<0>(return_values) = NETWORK::TEXTURE_DOWNLOAD_REQUEST(&gamerHandle, filePath.is() ? filePath.as() : nullptr, name.is() ? name.as() : nullptr, p3); std::get<1>(return_values) = gamerHandle; return return_values; } - static int LUA_NATIVE_NETWORK_TITLE_TEXTURE_DOWNLOAD_REQUEST(const char* filePath, const char* name, bool p2) + static int LUA_NATIVE_NETWORK_TITLE_TEXTURE_DOWNLOAD_REQUEST(sol::stack_object filePath, sol::stack_object name, bool p2) { - auto retval = NETWORK::TITLE_TEXTURE_DOWNLOAD_REQUEST(filePath, name, p2); + auto retval = NETWORK::TITLE_TEXTURE_DOWNLOAD_REQUEST(filePath.is() ? filePath.as() : nullptr, name.is() ? name.as() : nullptr, p2); return retval; } - static int LUA_NATIVE_NETWORK_UGC_TEXTURE_DOWNLOAD_REQUEST(const char* p0, int p1, int p2, int p3, const char* p4, bool p5) + static int LUA_NATIVE_NETWORK_UGC_TEXTURE_DOWNLOAD_REQUEST(sol::stack_object p0, int p1, int p2, int p3, sol::stack_object p4, bool p5) { - auto retval = NETWORK::UGC_TEXTURE_DOWNLOAD_REQUEST(p0, p1, p2, p3, p4, p5); + auto retval = NETWORK::UGC_TEXTURE_DOWNLOAD_REQUEST(p0.is() ? p0.as() : nullptr, p1, p2, p3, p4.is() ? p4.as() : nullptr, p5); return retval; } @@ -4953,6 +5000,18 @@ namespace lua::native return retval; } + static bool LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_MP_TEXT_COMMUNICATION_() + { + auto retval = (bool)NETWORK::_NETWORK_HAS_ROS_PRIVILEGE_MP_TEXT_COMMUNICATION(); + return retval; + } + + static bool LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_MP_VOICE_COMMUNICATION_() + { + auto retval = (bool)NETWORK::_NETWORK_HAS_ROS_PRIVILEGE_MP_VOICE_COMMUNICATION(); + return retval; + } + static int LUA_NATIVE_NETWORK_NETWORK_START_COMMUNICATION_PERMISSIONS_CHECK(Any p0) { auto retval = NETWORK::NETWORK_START_COMMUNICATION_PERMISSIONS_CHECK(p0); @@ -5142,6 +5201,7 @@ namespace lua::native NETWORK.set_function("NETWORK_HAS_AGE_RESTRICTIONS", LUA_NATIVE_NETWORK_NETWORK_HAS_AGE_RESTRICTIONS); NETWORK.set_function("NETWORK_HAVE_USER_CONTENT_PRIVILEGES", LUA_NATIVE_NETWORK_NETWORK_HAVE_USER_CONTENT_PRIVILEGES); NETWORK.set_function("NETWORK_HAVE_COMMUNICATION_PRIVILEGES", LUA_NATIVE_NETWORK_NETWORK_HAVE_COMMUNICATION_PRIVILEGES); + NETWORK.set_function("NETWORK_HAVE_PLATFORM_COMMUNICATION_PRIVILEGES_", LUA_NATIVE_NETWORK_NETWORK_HAVE_PLATFORM_COMMUNICATION_PRIVILEGES_); NETWORK.set_function("NETWORK_CHECK_ONLINE_PRIVILEGES", LUA_NATIVE_NETWORK_NETWORK_CHECK_ONLINE_PRIVILEGES); NETWORK.set_function("NETWORK_CHECK_USER_CONTENT_PRIVILEGES", LUA_NATIVE_NETWORK_NETWORK_CHECK_USER_CONTENT_PRIVILEGES); NETWORK.set_function("NETWORK_CHECK_COMMUNICATION_PRIVILEGES", LUA_NATIVE_NETWORK_NETWORK_CHECK_COMMUNICATION_PRIVILEGES); @@ -5179,6 +5239,7 @@ namespace lua::native NETWORK.set_function("NETWORK_SESSION_IS_CLOSED_CREW", LUA_NATIVE_NETWORK_NETWORK_SESSION_IS_CLOSED_CREW); NETWORK.set_function("NETWORK_SESSION_IS_SOLO", LUA_NATIVE_NETWORK_NETWORK_SESSION_IS_SOLO); NETWORK.set_function("NETWORK_SESSION_IS_PRIVATE", LUA_NATIVE_NETWORK_NETWORK_SESSION_IS_PRIVATE); + NETWORK.set_function("NETWORK_SESSION_LEAVE_INCLUDING_REASON_", LUA_NATIVE_NETWORK_NETWORK_SESSION_LEAVE_INCLUDING_REASON_); NETWORK.set_function("NETWORK_SESSION_END", LUA_NATIVE_NETWORK_NETWORK_SESSION_END); NETWORK.set_function("NETWORK_SESSION_LEAVE", LUA_NATIVE_NETWORK_NETWORK_SESSION_LEAVE); NETWORK.set_function("NETWORK_SESSION_KICK_PLAYER", LUA_NATIVE_NETWORK_NETWORK_SESSION_KICK_PLAYER); @@ -5191,6 +5252,7 @@ namespace lua::native NETWORK.set_function("NETWORK_SESSION_GET_MATCHMAKING_GROUP_FREE", LUA_NATIVE_NETWORK_NETWORK_SESSION_GET_MATCHMAKING_GROUP_FREE); NETWORK.set_function("NETWORK_SESSION_ADD_ACTIVE_MATCHMAKING_GROUP", LUA_NATIVE_NETWORK_NETWORK_SESSION_ADD_ACTIVE_MATCHMAKING_GROUP); NETWORK.set_function("NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT", LUA_NATIVE_NETWORK_NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT); + NETWORK.set_function("NETWORK_SESSION_GET_UNIQUE_CREW_LIMIT", LUA_NATIVE_NETWORK_NETWORK_SESSION_GET_UNIQUE_CREW_LIMIT); NETWORK.set_function("NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT_TRANSITION", LUA_NATIVE_NETWORK_NETWORK_SESSION_SET_UNIQUE_CREW_LIMIT_TRANSITION); NETWORK.set_function("NETWORK_SESSION_SET_UNIQUE_CREW_ONLY_CREWS_TRANSITION", LUA_NATIVE_NETWORK_NETWORK_SESSION_SET_UNIQUE_CREW_ONLY_CREWS_TRANSITION); NETWORK.set_function("NETWORK_SESSION_SET_CREW_LIMIT_MAX_MEMBERS_TRANSITION", LUA_NATIVE_NETWORK_NETWORK_SESSION_SET_CREW_LIMIT_MAX_MEMBERS_TRANSITION); @@ -5241,6 +5303,7 @@ namespace lua::native NETWORK.set_function("NETWORK_IS_GAME_IN_PROGRESS", LUA_NATIVE_NETWORK_NETWORK_IS_GAME_IN_PROGRESS); NETWORK.set_function("NETWORK_IS_SESSION_ACTIVE", LUA_NATIVE_NETWORK_NETWORK_IS_SESSION_ACTIVE); NETWORK.set_function("NETWORK_IS_IN_SESSION", LUA_NATIVE_NETWORK_NETWORK_IS_IN_SESSION); + NETWORK.set_function("NETWORK_IS_AMERICAS_VERSION_", LUA_NATIVE_NETWORK_NETWORK_IS_AMERICAS_VERSION_); NETWORK.set_function("NETWORK_IS_SESSION_STARTED", LUA_NATIVE_NETWORK_NETWORK_IS_SESSION_STARTED); NETWORK.set_function("NETWORK_IS_SESSION_BUSY", LUA_NATIVE_NETWORK_NETWORK_IS_SESSION_BUSY); NETWORK.set_function("NETWORK_CAN_SESSION_END", LUA_NATIVE_NETWORK_NETWORK_CAN_SESSION_END); @@ -5507,6 +5570,9 @@ namespace lua::native NETWORK.set_function("NETWORK_GET_PLAYER_OWNS_WAYPOINT", LUA_NATIVE_NETWORK_NETWORK_GET_PLAYER_OWNS_WAYPOINT); NETWORK.set_function("NETWORK_CAN_SET_WAYPOINT", LUA_NATIVE_NETWORK_NETWORK_CAN_SET_WAYPOINT); NETWORK.set_function("NETWORK_IGNORE_REMOTE_WAYPOINTS", LUA_NATIVE_NETWORK_NETWORK_IGNORE_REMOTE_WAYPOINTS); + NETWORK.set_function("NETWORK_DOES_COMMUNICATION_GROUP_EXIST_", LUA_NATIVE_NETWORK_NETWORK_DOES_COMMUNICATION_GROUP_EXIST_); + NETWORK.set_function("NETWORK_GET_COMMUNICATION_GROUP_FLAGS_", LUA_NATIVE_NETWORK_NETWORK_GET_COMMUNICATION_GROUP_FLAGS_); + NETWORK.set_function("NETWORK_SET_COMMUNICATION_GROUP_FLAGS_", LUA_NATIVE_NETWORK_NETWORK_SET_COMMUNICATION_GROUP_FLAGS_); NETWORK.set_function("NETWORK_IS_PLAYER_ON_BLOCKLIST", LUA_NATIVE_NETWORK_NETWORK_IS_PLAYER_ON_BLOCKLIST); NETWORK.set_function("NETWORK_SET_SCRIPT_AUTOMUTED", LUA_NATIVE_NETWORK_NETWORK_SET_SCRIPT_AUTOMUTED); NETWORK.set_function("NETWORK_HAS_AUTOMUTE_OVERRIDE", LUA_NATIVE_NETWORK_NETWORK_HAS_AUTOMUTE_OVERRIDE); @@ -5883,6 +5949,7 @@ namespace lua::native NETWORK.set_function("UGC_GET_CACHED_DESCRIPTION", LUA_NATIVE_NETWORK_UGC_GET_CACHED_DESCRIPTION); NETWORK.set_function("UGC_RELEASE_CACHED_DESCRIPTION", LUA_NATIVE_NETWORK_UGC_RELEASE_CACHED_DESCRIPTION); NETWORK.set_function("UGC_RELEASE_ALL_CACHED_DESCRIPTIONS", LUA_NATIVE_NETWORK_UGC_RELEASE_ALL_CACHED_DESCRIPTIONS); + NETWORK.set_function("UGC_HAS_PERMISSION_TO_WRITE", LUA_NATIVE_NETWORK_UGC_HAS_PERMISSION_TO_WRITE); NETWORK.set_function("UGC_PUBLISH", LUA_NATIVE_NETWORK_UGC_PUBLISH); NETWORK.set_function("UGC_SET_BOOKMARKED", LUA_NATIVE_NETWORK_UGC_SET_BOOKMARKED); NETWORK.set_function("UGC_SET_DELETED", LUA_NATIVE_NETWORK_UGC_SET_DELETED); @@ -5926,6 +5993,8 @@ namespace lua::native NETWORK.set_function("NETWORK_HAS_ROS_PRIVILEGE_END_DATE", LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_END_DATE); NETWORK.set_function("NETWORK_HAS_ROS_PRIVILEGE_PLAYED_LAST_GEN", LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_PLAYED_LAST_GEN); NETWORK.set_function("NETWORK_HAS_ROS_PRIVILEGE_SPECIAL_EDITION_CONTENT", LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_SPECIAL_EDITION_CONTENT); + NETWORK.set_function("NETWORK_HAS_ROS_PRIVILEGE_MP_TEXT_COMMUNICATION_", LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_MP_TEXT_COMMUNICATION_); + NETWORK.set_function("NETWORK_HAS_ROS_PRIVILEGE_MP_VOICE_COMMUNICATION_", LUA_NATIVE_NETWORK_NETWORK_HAS_ROS_PRIVILEGE_MP_VOICE_COMMUNICATION_); NETWORK.set_function("NETWORK_START_COMMUNICATION_PERMISSIONS_CHECK", LUA_NATIVE_NETWORK_NETWORK_START_COMMUNICATION_PERMISSIONS_CHECK); NETWORK.set_function("NETWORK_START_USER_CONTENT_PERMISSIONS_CHECK", LUA_NATIVE_NETWORK_NETWORK_START_USER_CONTENT_PERMISSIONS_CHECK); NETWORK.set_function("NETWORK_SKIP_RADIO_RESET_NEXT_CLOSE", LUA_NATIVE_NETWORK_NETWORK_SKIP_RADIO_RESET_NEXT_CLOSE); diff --git a/src/lua/natives/lua_native_binding_OBJECT.cpp b/src/lua/natives/lua_native_binding_OBJECT.cpp index 93391514..1b695323 100644 --- a/src/lua/natives/lua_native_binding_OBJECT.cpp +++ b/src/lua/natives/lua_native_binding_OBJECT.cpp @@ -395,9 +395,9 @@ namespace lua::native OBJECT::SET_CUTSCENES_WEAPON_FLASHLIGHT_ON_THIS_FRAME(object, toggle); } - static Object LUA_NATIVE_OBJECT_GET_RAYFIRE_MAP_OBJECT(float x, float y, float z, float radius, const char* name) + static Object LUA_NATIVE_OBJECT_GET_RAYFIRE_MAP_OBJECT(float x, float y, float z, float radius, sol::stack_object name) { - auto retval = OBJECT::GET_RAYFIRE_MAP_OBJECT(x, y, z, radius, name); + auto retval = OBJECT::GET_RAYFIRE_MAP_OBJECT(x, y, z, radius, name.is() ? name.as() : nullptr); return retval; } diff --git a/src/lua/natives/lua_native_binding_PAD.cpp b/src/lua/natives/lua_native_binding_PAD.cpp index 8eb38b0d..a7c74dc6 100644 --- a/src/lua/natives/lua_native_binding_PAD.cpp +++ b/src/lua/natives/lua_native_binding_PAD.cpp @@ -253,15 +253,15 @@ namespace lua::native PAD::ENABLE_ALL_CONTROL_ACTIONS(control); } - static bool LUA_NATIVE_PAD_INIT_PC_SCRIPTED_CONTROLS(const char* schemeName) + static bool LUA_NATIVE_PAD_INIT_PC_SCRIPTED_CONTROLS(sol::stack_object schemeName) { - auto retval = (bool)PAD::INIT_PC_SCRIPTED_CONTROLS(schemeName); + auto retval = (bool)PAD::INIT_PC_SCRIPTED_CONTROLS(schemeName.is() ? schemeName.as() : nullptr); return retval; } - static bool LUA_NATIVE_PAD_SWITCH_PC_SCRIPTED_CONTROLS(const char* schemeName) + static bool LUA_NATIVE_PAD_SWITCH_PC_SCRIPTED_CONTROLS(sol::stack_object schemeName) { - auto retval = (bool)PAD::SWITCH_PC_SCRIPTED_CONTROLS(schemeName); + auto retval = (bool)PAD::SWITCH_PC_SCRIPTED_CONTROLS(schemeName.is() ? schemeName.as() : nullptr); return retval; } diff --git a/src/lua/natives/lua_native_binding_PED.cpp b/src/lua/natives/lua_native_binding_PED.cpp index 176c3e5f..66e1bb88 100644 --- a/src/lua/natives/lua_native_binding_PED.cpp +++ b/src/lua/natives/lua_native_binding_PED.cpp @@ -732,9 +732,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_PED_SET_PED_STEALTH_MOVEMENT(Ped ped, bool p1, const char* action) + static void LUA_NATIVE_PED_SET_PED_STEALTH_MOVEMENT(Ped ped, bool p1, sol::stack_object action) { - PED::SET_PED_STEALTH_MOVEMENT(ped, p1, action); + PED::SET_PED_STEALTH_MOVEMENT(ped, p1, action.is() ? action.as() : nullptr); } static bool LUA_NATIVE_PED_GET_PED_STEALTH_MOVEMENT(Ped ped) @@ -892,6 +892,12 @@ namespace lua::native return retval; } + static bool LUA_NATIVE_PED_HAS_PED_CLEAR_LOS_TO_ENTITY_(Ped ped, Entity entity, float x, float y, float z, int p5, bool p6, bool p7) + { + auto retval = (bool)PED::_HAS_PED_CLEAR_LOS_TO_ENTITY(ped, entity, x, y, z, p5, p6, p7); + return retval; + } + static int LUA_NATIVE_PED_GET_SEAT_PED_IS_TRYING_TO_ENTER(Ped ped) { auto retval = PED::GET_SEAT_PED_IS_TRYING_TO_ENTER(ped); @@ -954,10 +960,10 @@ namespace lua::native PED::CLEAR_RELATIONSHIP_BETWEEN_GROUPS(relationship, group1, group2); } - static std::tuple LUA_NATIVE_PED_ADD_RELATIONSHIP_GROUP(const char* name, Hash groupHash) + static std::tuple LUA_NATIVE_PED_ADD_RELATIONSHIP_GROUP(sol::stack_object name, Hash groupHash) { std::tuple return_values; - std::get<0>(return_values) = (bool)PED::ADD_RELATIONSHIP_GROUP(name, &groupHash); + std::get<0>(return_values) = (bool)PED::ADD_RELATIONSHIP_GROUP(name.is() ? name.as() : nullptr, &groupHash); std::get<1>(return_values) = groupHash; return return_values; @@ -1120,9 +1126,9 @@ namespace lua::native PED::SET_PED_GRAVITY(ped, toggle); } - static void LUA_NATIVE_PED_APPLY_DAMAGE_TO_PED(Ped ped, int damageAmount, bool p2, Any p3, int p4) + static void LUA_NATIVE_PED_APPLY_DAMAGE_TO_PED(Ped ped, int damageAmount, bool p2, Any p3, Hash weaponType) { - PED::APPLY_DAMAGE_TO_PED(ped, damageAmount, p2, p3, p4); + PED::APPLY_DAMAGE_TO_PED(ped, damageAmount, p2, p3, weaponType); } static int LUA_NATIVE_PED_GET_TIME_PED_DAMAGED_BY_WEAPON(Ped ped, Hash weaponHash) @@ -1348,9 +1354,9 @@ namespace lua::native PED::SET_PED_GET_OUT_UPSIDE_DOWN_VEHICLE(ped, toggle); } - static void LUA_NATIVE_PED_SET_PED_MOVEMENT_CLIPSET(Ped ped, const char* clipSet, float transitionSpeed) + static void LUA_NATIVE_PED_SET_PED_MOVEMENT_CLIPSET(Ped ped, sol::stack_object clipSet, float transitionSpeed) { - PED::SET_PED_MOVEMENT_CLIPSET(ped, clipSet, transitionSpeed); + PED::SET_PED_MOVEMENT_CLIPSET(ped, clipSet.is() ? clipSet.as() : nullptr, transitionSpeed); } static void LUA_NATIVE_PED_RESET_PED_MOVEMENT_CLIPSET(Ped ped, float p1) @@ -1358,9 +1364,9 @@ namespace lua::native PED::RESET_PED_MOVEMENT_CLIPSET(ped, p1); } - static void LUA_NATIVE_PED_SET_PED_STRAFE_CLIPSET(Ped ped, const char* clipSet) + static void LUA_NATIVE_PED_SET_PED_STRAFE_CLIPSET(Ped ped, sol::stack_object clipSet) { - PED::SET_PED_STRAFE_CLIPSET(ped, clipSet); + PED::SET_PED_STRAFE_CLIPSET(ped, clipSet.is() ? clipSet.as() : nullptr); } static void LUA_NATIVE_PED_RESET_PED_STRAFE_CLIPSET(Ped ped) @@ -1368,9 +1374,9 @@ namespace lua::native PED::RESET_PED_STRAFE_CLIPSET(ped); } - static void LUA_NATIVE_PED_SET_PED_WEAPON_MOVEMENT_CLIPSET(Ped ped, const char* clipSet) + static void LUA_NATIVE_PED_SET_PED_WEAPON_MOVEMENT_CLIPSET(Ped ped, sol::stack_object clipSet) { - PED::SET_PED_WEAPON_MOVEMENT_CLIPSET(ped, clipSet); + PED::SET_PED_WEAPON_MOVEMENT_CLIPSET(ped, clipSet.is() ? clipSet.as() : nullptr); } static void LUA_NATIVE_PED_RESET_PED_WEAPON_MOVEMENT_CLIPSET(Ped ped) @@ -1378,9 +1384,9 @@ namespace lua::native PED::RESET_PED_WEAPON_MOVEMENT_CLIPSET(ped); } - static void LUA_NATIVE_PED_SET_PED_DRIVE_BY_CLIPSET_OVERRIDE(Ped ped, const char* clipset) + static void LUA_NATIVE_PED_SET_PED_DRIVE_BY_CLIPSET_OVERRIDE(Ped ped, sol::stack_object clipset) { - PED::SET_PED_DRIVE_BY_CLIPSET_OVERRIDE(ped, clipset); + PED::SET_PED_DRIVE_BY_CLIPSET_OVERRIDE(ped, clipset.is() ? clipset.as() : nullptr); } static void LUA_NATIVE_PED_CLEAR_PED_DRIVE_BY_CLIPSET_OVERRIDE(Ped ped) @@ -1388,9 +1394,9 @@ namespace lua::native PED::CLEAR_PED_DRIVE_BY_CLIPSET_OVERRIDE(ped); } - static void LUA_NATIVE_PED_SET_PED_MOTION_IN_COVER_CLIPSET_OVERRIDE(Ped ped, const char* p1) + static void LUA_NATIVE_PED_SET_PED_MOTION_IN_COVER_CLIPSET_OVERRIDE(Ped ped, sol::stack_object p1) { - PED::SET_PED_MOTION_IN_COVER_CLIPSET_OVERRIDE(ped, p1); + PED::SET_PED_MOTION_IN_COVER_CLIPSET_OVERRIDE(ped, p1.is() ? p1.as() : nullptr); } static void LUA_NATIVE_PED_CLEAR_PED_MOTION_IN_COVER_CLIPSET_OVERRIDE(Ped ped) @@ -1413,15 +1419,15 @@ namespace lua::native PED::RESET_PED_IN_VEHICLE_CONTEXT(ped); } - static bool LUA_NATIVE_PED_IS_SCRIPTED_SCENARIO_PED_USING_CONDITIONAL_ANIM(Ped ped, const char* animDict, const char* anim) + static bool LUA_NATIVE_PED_IS_SCRIPTED_SCENARIO_PED_USING_CONDITIONAL_ANIM(Ped ped, sol::stack_object animDict, sol::stack_object anim) { - auto retval = (bool)PED::IS_SCRIPTED_SCENARIO_PED_USING_CONDITIONAL_ANIM(ped, animDict, anim); + auto retval = (bool)PED::IS_SCRIPTED_SCENARIO_PED_USING_CONDITIONAL_ANIM(ped, animDict.is() ? animDict.as() : nullptr, anim.is() ? anim.as() : nullptr); return retval; } - static void LUA_NATIVE_PED_SET_PED_ALTERNATE_WALK_ANIM(Ped ped, const char* animDict, const char* animName, float p3, bool p4) + static void LUA_NATIVE_PED_SET_PED_ALTERNATE_WALK_ANIM(Ped ped, sol::stack_object animDict, sol::stack_object animName, float p3, bool p4) { - PED::SET_PED_ALTERNATE_WALK_ANIM(ped, animDict, animName, p3, p4); + PED::SET_PED_ALTERNATE_WALK_ANIM(ped, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, p3, p4); } static void LUA_NATIVE_PED_CLEAR_PED_ALTERNATE_WALK_ANIM(Ped ped, float p1) @@ -1429,9 +1435,9 @@ namespace lua::native PED::CLEAR_PED_ALTERNATE_WALK_ANIM(ped, p1); } - static void LUA_NATIVE_PED_SET_PED_ALTERNATE_MOVEMENT_ANIM(Ped ped, int stance, const char* animDictionary, const char* animationName, float p4, bool p5) + static void LUA_NATIVE_PED_SET_PED_ALTERNATE_MOVEMENT_ANIM(Ped ped, int stance, sol::stack_object animDictionary, sol::stack_object animationName, float p4, bool p5) { - PED::SET_PED_ALTERNATE_MOVEMENT_ANIM(ped, stance, animDictionary, animationName, p4, p5); + PED::SET_PED_ALTERNATE_MOVEMENT_ANIM(ped, stance, animDictionary.is() ? animDictionary.as() : nullptr, animationName.is() ? animationName.as() : nullptr, p4, p5); } static void LUA_NATIVE_PED_CLEAR_PED_ALTERNATE_MOVEMENT_ANIM(Ped ped, int stance, float p2) @@ -1439,20 +1445,20 @@ namespace lua::native PED::CLEAR_PED_ALTERNATE_MOVEMENT_ANIM(ped, stance, p2); } - static void LUA_NATIVE_PED_SET_PED_GESTURE_GROUP(Ped ped, const char* animGroupGesture) + static void LUA_NATIVE_PED_SET_PED_GESTURE_GROUP(Ped ped, sol::stack_object animGroupGesture) { - PED::SET_PED_GESTURE_GROUP(ped, animGroupGesture); + PED::SET_PED_GESTURE_GROUP(ped, animGroupGesture.is() ? animGroupGesture.as() : nullptr); } - static Vector3 LUA_NATIVE_PED_GET_ANIM_INITIAL_OFFSET_POSITION(const char* animDict, const char* animName, float x, float y, float z, float xRot, float yRot, float zRot, float p8, int p9) + static Vector3 LUA_NATIVE_PED_GET_ANIM_INITIAL_OFFSET_POSITION(sol::stack_object animDict, sol::stack_object animName, float x, float y, float z, float xRot, float yRot, float zRot, float p8, int p9) { - auto retval = PED::GET_ANIM_INITIAL_OFFSET_POSITION(animDict, animName, x, y, z, xRot, yRot, zRot, p8, p9); + auto retval = PED::GET_ANIM_INITIAL_OFFSET_POSITION(animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, x, y, z, xRot, yRot, zRot, p8, p9); return retval; } - static Vector3 LUA_NATIVE_PED_GET_ANIM_INITIAL_OFFSET_ROTATION(const char* animDict, const char* animName, float x, float y, float z, float xRot, float yRot, float zRot, float p8, int p9) + static Vector3 LUA_NATIVE_PED_GET_ANIM_INITIAL_OFFSET_ROTATION(sol::stack_object animDict, sol::stack_object animName, float x, float y, float z, float xRot, float yRot, float zRot, float p8, int p9) { - auto retval = PED::GET_ANIM_INITIAL_OFFSET_ROTATION(animDict, animName, x, y, z, xRot, yRot, zRot, p8, p9); + auto retval = PED::GET_ANIM_INITIAL_OFFSET_ROTATION(animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, x, y, z, xRot, yRot, zRot, p8, p9); return retval; } @@ -2038,9 +2044,9 @@ namespace lua::native PED::RESURRECT_PED(ped); } - static void LUA_NATIVE_PED_SET_PED_NAME_DEBUG(Ped ped, const char* name) + static void LUA_NATIVE_PED_SET_PED_NAME_DEBUG(Ped ped, sol::stack_object name) { - PED::SET_PED_NAME_DEBUG(ped, name); + PED::SET_PED_NAME_DEBUG(ped, name.is() ? name.as() : nullptr); } static Vector3 LUA_NATIVE_PED_GET_PED_EXTRACTED_DISPLACEMENT(Ped ped, bool worldSpace) @@ -2074,29 +2080,29 @@ namespace lua::native PED::APPLY_PED_BLOOD_DAMAGE_BY_ZONE(ped, p1, p2, p3, p4); } - static void LUA_NATIVE_PED_APPLY_PED_BLOOD(Ped ped, int boneIndex, float xRot, float yRot, float zRot, const char* woundType) + static void LUA_NATIVE_PED_APPLY_PED_BLOOD(Ped ped, int boneIndex, float xRot, float yRot, float zRot, sol::stack_object woundType) { - PED::APPLY_PED_BLOOD(ped, boneIndex, xRot, yRot, zRot, woundType); + PED::APPLY_PED_BLOOD(ped, boneIndex, xRot, yRot, zRot, woundType.is() ? woundType.as() : nullptr); } - static void LUA_NATIVE_PED_APPLY_PED_BLOOD_BY_ZONE(Ped ped, int p1, float p2, float p3, const char* p4) + static void LUA_NATIVE_PED_APPLY_PED_BLOOD_BY_ZONE(Ped ped, int p1, float p2, float p3, sol::stack_object p4) { - PED::APPLY_PED_BLOOD_BY_ZONE(ped, p1, p2, p3, p4); + PED::APPLY_PED_BLOOD_BY_ZONE(ped, p1, p2, p3, p4.is() ? p4.as() : nullptr); } - static void LUA_NATIVE_PED_APPLY_PED_BLOOD_SPECIFIC(Ped ped, int p1, float p2, float p3, float p4, float p5, int p6, float p7, const char* p8) + static void LUA_NATIVE_PED_APPLY_PED_BLOOD_SPECIFIC(Ped ped, int p1, float p2, float p3, float p4, float p5, int p6, float p7, sol::stack_object p8) { - PED::APPLY_PED_BLOOD_SPECIFIC(ped, p1, p2, p3, p4, p5, p6, p7, p8); + PED::APPLY_PED_BLOOD_SPECIFIC(ped, p1, p2, p3, p4, p5, p6, p7, p8.is() ? p8.as() : nullptr); } - static void LUA_NATIVE_PED_APPLY_PED_DAMAGE_DECAL(Ped ped, int damageZone, float xOffset, float yOffset, float heading, float scale, float alpha, int variation, bool fadeIn, const char* decalName) + static void LUA_NATIVE_PED_APPLY_PED_DAMAGE_DECAL(Ped ped, int damageZone, float xOffset, float yOffset, float heading, float scale, float alpha, int variation, bool fadeIn, sol::stack_object decalName) { - PED::APPLY_PED_DAMAGE_DECAL(ped, damageZone, xOffset, yOffset, heading, scale, alpha, variation, fadeIn, decalName); + PED::APPLY_PED_DAMAGE_DECAL(ped, damageZone, xOffset, yOffset, heading, scale, alpha, variation, fadeIn, decalName.is() ? decalName.as() : nullptr); } - static void LUA_NATIVE_PED_APPLY_PED_DAMAGE_PACK(Ped ped, const char* damagePack, float damage, float mult) + static void LUA_NATIVE_PED_APPLY_PED_DAMAGE_PACK(Ped ped, sol::stack_object damagePack, float damage, float mult) { - PED::APPLY_PED_DAMAGE_PACK(ped, damagePack, damage, mult); + PED::APPLY_PED_DAMAGE_PACK(ped, damagePack.is() ? damagePack.as() : nullptr, damage, mult); } static void LUA_NATIVE_PED_CLEAR_PED_BLOOD_DAMAGE(Ped ped) @@ -2114,9 +2120,9 @@ namespace lua::native PED::HIDE_PED_BLOOD_DAMAGE_BY_ZONE(ped, p1, p2); } - static void LUA_NATIVE_PED_CLEAR_PED_DAMAGE_DECAL_BY_ZONE(Ped ped, int p1, const char* p2) + static void LUA_NATIVE_PED_CLEAR_PED_DAMAGE_DECAL_BY_ZONE(Ped ped, int p1, sol::stack_object p2) { - PED::CLEAR_PED_DAMAGE_DECAL_BY_ZONE(ped, p1, p2); + PED::CLEAR_PED_DAMAGE_DECAL_BY_ZONE(ped, p1, p2.is() ? p2.as() : nullptr); } static int LUA_NATIVE_PED_GET_PED_DECORATIONS_STATE(Ped ped) @@ -2235,9 +2241,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_PED_IS_PED_USING_SCENARIO(Ped ped, const char* scenario) + static bool LUA_NATIVE_PED_IS_PED_USING_SCENARIO(Ped ped, sol::stack_object scenario) { - auto retval = (bool)PED::IS_PED_USING_SCENARIO(ped, scenario); + auto retval = (bool)PED::IS_PED_USING_SCENARIO(ped, scenario.is() ? scenario.as() : nullptr); return retval; } @@ -2312,19 +2318,19 @@ namespace lua::native PED::RESET_FACIAL_IDLE_ANIM(ped); } - static void LUA_NATIVE_PED_PLAY_FACIAL_ANIM(Ped ped, const char* animName, const char* animDict) + static void LUA_NATIVE_PED_PLAY_FACIAL_ANIM(Ped ped, sol::stack_object animName, sol::stack_object animDict) { - PED::PLAY_FACIAL_ANIM(ped, animName, animDict); + PED::PLAY_FACIAL_ANIM(ped, animName.is() ? animName.as() : nullptr, animDict.is() ? animDict.as() : nullptr); } - static void LUA_NATIVE_PED_SET_FACIAL_CLIPSET(Ped ped, const char* animDict) + static void LUA_NATIVE_PED_SET_FACIAL_CLIPSET(Ped ped, sol::stack_object animDict) { - PED::SET_FACIAL_CLIPSET(ped, animDict); + PED::SET_FACIAL_CLIPSET(ped, animDict.is() ? animDict.as() : nullptr); } - static void LUA_NATIVE_PED_SET_FACIAL_IDLE_ANIM_OVERRIDE(Ped ped, const char* animName, const char* animDict) + static void LUA_NATIVE_PED_SET_FACIAL_IDLE_ANIM_OVERRIDE(Ped ped, sol::stack_object animName, sol::stack_object animDict) { - PED::SET_FACIAL_IDLE_ANIM_OVERRIDE(ped, animName, animDict); + PED::SET_FACIAL_IDLE_ANIM_OVERRIDE(ped, animName.is() ? animName.as() : nullptr, animDict.is() ? animDict.as() : nullptr); } static void LUA_NATIVE_PED_CLEAR_FACIAL_IDLE_ANIM_OVERRIDE(Ped ped) @@ -2731,9 +2737,9 @@ namespace lua::native PED::SET_PED_FLEE_ATTRIBUTES(ped, attributeFlags, enable); } - static void LUA_NATIVE_PED_SET_PED_COWER_HASH(Ped ped, const char* p1) + static void LUA_NATIVE_PED_SET_PED_COWER_HASH(Ped ped, sol::stack_object p1) { - PED::SET_PED_COWER_HASH(ped, p1); + PED::SET_PED_COWER_HASH(ped, p1.is() ? p1.as() : nullptr); } static void LUA_NATIVE_PED_SET_PED_STEERS_AROUND_DEAD_BODIES(Ped ped, bool toggle) @@ -3091,14 +3097,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_PED_SET_PED_USING_ACTION_MODE(Ped ped, bool p1, int p2, const char* action) + static void LUA_NATIVE_PED_SET_PED_USING_ACTION_MODE(Ped ped, bool p1, int p2, sol::stack_object action) { - PED::SET_PED_USING_ACTION_MODE(ped, p1, p2, action); + PED::SET_PED_USING_ACTION_MODE(ped, p1, p2, action.is() ? action.as() : nullptr); } - static void LUA_NATIVE_PED_SET_MOVEMENT_MODE_OVERRIDE(Ped ped, const char* name) + static void LUA_NATIVE_PED_SET_MOVEMENT_MODE_OVERRIDE(Ped ped, sol::stack_object name) { - PED::SET_MOVEMENT_MODE_OVERRIDE(ped, name); + PED::SET_MOVEMENT_MODE_OVERRIDE(ped, name.is() ? name.as() : nullptr); } static void LUA_NATIVE_PED_SET_PED_CAPSULE(Ped ped, float value) @@ -3252,36 +3258,36 @@ namespace lua::native PED::FORCE_INSTANT_LEG_IK_SETUP(ped); } - static void LUA_NATIVE_PED_REQUEST_ACTION_MODE_ASSET(const char* asset) + static void LUA_NATIVE_PED_REQUEST_ACTION_MODE_ASSET(sol::stack_object asset) { - PED::REQUEST_ACTION_MODE_ASSET(asset); + PED::REQUEST_ACTION_MODE_ASSET(asset.is() ? asset.as() : nullptr); } - static bool LUA_NATIVE_PED_HAS_ACTION_MODE_ASSET_LOADED(const char* asset) + static bool LUA_NATIVE_PED_HAS_ACTION_MODE_ASSET_LOADED(sol::stack_object asset) { - auto retval = (bool)PED::HAS_ACTION_MODE_ASSET_LOADED(asset); + auto retval = (bool)PED::HAS_ACTION_MODE_ASSET_LOADED(asset.is() ? asset.as() : nullptr); return retval; } - static void LUA_NATIVE_PED_REMOVE_ACTION_MODE_ASSET(const char* asset) + static void LUA_NATIVE_PED_REMOVE_ACTION_MODE_ASSET(sol::stack_object asset) { - PED::REMOVE_ACTION_MODE_ASSET(asset); + PED::REMOVE_ACTION_MODE_ASSET(asset.is() ? asset.as() : nullptr); } - static void LUA_NATIVE_PED_REQUEST_STEALTH_MODE_ASSET(const char* asset) + static void LUA_NATIVE_PED_REQUEST_STEALTH_MODE_ASSET(sol::stack_object asset) { - PED::REQUEST_STEALTH_MODE_ASSET(asset); + PED::REQUEST_STEALTH_MODE_ASSET(asset.is() ? asset.as() : nullptr); } - static bool LUA_NATIVE_PED_HAS_STEALTH_MODE_ASSET_LOADED(const char* asset) + static bool LUA_NATIVE_PED_HAS_STEALTH_MODE_ASSET_LOADED(sol::stack_object asset) { - auto retval = (bool)PED::HAS_STEALTH_MODE_ASSET_LOADED(asset); + auto retval = (bool)PED::HAS_STEALTH_MODE_ASSET_LOADED(asset.is() ? asset.as() : nullptr); return retval; } - static void LUA_NATIVE_PED_REMOVE_STEALTH_MODE_ASSET(const char* asset) + static void LUA_NATIVE_PED_REMOVE_STEALTH_MODE_ASSET(sol::stack_object asset) { - PED::REMOVE_STEALTH_MODE_ASSET(asset); + PED::REMOVE_STEALTH_MODE_ASSET(asset.is() ? asset.as() : nullptr); } static void LUA_NATIVE_PED_SET_PED_LOD_MULTIPLIER(Ped ped, float multiplier) @@ -3545,6 +3551,7 @@ namespace lua::native PED.set_function("IS_PED_IN_HIGH_COVER", LUA_NATIVE_PED_IS_PED_IN_HIGH_COVER); PED.set_function("IS_PED_GOING_INTO_COVER", LUA_NATIVE_PED_IS_PED_GOING_INTO_COVER); PED.set_function("SET_PED_PINNED_DOWN", LUA_NATIVE_PED_SET_PED_PINNED_DOWN); + PED.set_function("HAS_PED_CLEAR_LOS_TO_ENTITY_", LUA_NATIVE_PED_HAS_PED_CLEAR_LOS_TO_ENTITY_); PED.set_function("GET_SEAT_PED_IS_TRYING_TO_ENTER", LUA_NATIVE_PED_GET_SEAT_PED_IS_TRYING_TO_ENTER); PED.set_function("GET_VEHICLE_PED_IS_TRYING_TO_ENTER", LUA_NATIVE_PED_GET_VEHICLE_PED_IS_TRYING_TO_ENTER); PED.set_function("GET_PED_SOURCE_OF_DEATH", LUA_NATIVE_PED_GET_PED_SOURCE_OF_DEATH); diff --git a/src/lua/natives/lua_native_binding_PHYSICS.cpp b/src/lua/natives/lua_native_binding_PHYSICS.cpp index fb299946..446999ea 100644 --- a/src/lua/natives/lua_native_binding_PHYSICS.cpp +++ b/src/lua/natives/lua_native_binding_PHYSICS.cpp @@ -44,9 +44,9 @@ namespace lua::native return ropeId; } - static void LUA_NATIVE_PHYSICS_LOAD_ROPE_DATA(int ropeId, const char* rope_preset) + static void LUA_NATIVE_PHYSICS_LOAD_ROPE_DATA(int ropeId, sol::stack_object rope_preset) { - PHYSICS::LOAD_ROPE_DATA(ropeId, rope_preset); + PHYSICS::LOAD_ROPE_DATA(ropeId, rope_preset.is() ? rope_preset.as() : nullptr); } static void LUA_NATIVE_PHYSICS_PIN_ROPE_VERTEX(int ropeId, int vertex, float x, float y, float z) diff --git a/src/lua/natives/lua_native_binding_PLAYER.cpp b/src/lua/natives/lua_native_binding_PLAYER.cpp index aaac3d93..58a902bb 100644 --- a/src/lua/natives/lua_native_binding_PLAYER.cpp +++ b/src/lua/natives/lua_native_binding_PLAYER.cpp @@ -552,9 +552,9 @@ namespace lua::native PLAYER::FORCE_CLEANUP(cleanupFlags); } - static void LUA_NATIVE_PLAYER_FORCE_CLEANUP_FOR_ALL_THREADS_WITH_THIS_NAME(const char* name, int cleanupFlags) + static void LUA_NATIVE_PLAYER_FORCE_CLEANUP_FOR_ALL_THREADS_WITH_THIS_NAME(sol::stack_object name, int cleanupFlags) { - PLAYER::FORCE_CLEANUP_FOR_ALL_THREADS_WITH_THIS_NAME(name, cleanupFlags); + PLAYER::FORCE_CLEANUP_FOR_ALL_THREADS_WITH_THIS_NAME(name.is() ? name.as() : nullptr, cleanupFlags); } static void LUA_NATIVE_PLAYER_FORCE_CLEANUP_FOR_THREAD_WITH_THIS_ID(int id, int cleanupFlags) @@ -672,6 +672,12 @@ namespace lua::native PLAYER::SET_PLAYER_TARGETING_MODE(targetMode); } + static int LUA_NATIVE_PLAYER_GET_PLAYER_TARGETING_MODE() + { + auto retval = PLAYER::GET_PLAYER_TARGETING_MODE(); + return retval; + } + static void LUA_NATIVE_PLAYER_SET_PLAYER_TARGET_LEVEL(int targetLevel) { PLAYER::SET_PLAYER_TARGET_LEVEL(targetLevel); @@ -1483,6 +1489,7 @@ namespace lua::native PLAYER.set_function("GIVE_PLAYER_RAGDOLL_CONTROL", LUA_NATIVE_PLAYER_GIVE_PLAYER_RAGDOLL_CONTROL); PLAYER.set_function("SET_PLAYER_LOCKON", LUA_NATIVE_PLAYER_SET_PLAYER_LOCKON); PLAYER.set_function("SET_PLAYER_TARGETING_MODE", LUA_NATIVE_PLAYER_SET_PLAYER_TARGETING_MODE); + PLAYER.set_function("GET_PLAYER_TARGETING_MODE", LUA_NATIVE_PLAYER_GET_PLAYER_TARGETING_MODE); PLAYER.set_function("SET_PLAYER_TARGET_LEVEL", LUA_NATIVE_PLAYER_SET_PLAYER_TARGET_LEVEL); PLAYER.set_function("GET_IS_USING_FPS_THIRD_PERSON_COVER", LUA_NATIVE_PLAYER_GET_IS_USING_FPS_THIRD_PERSON_COVER); PLAYER.set_function("GET_IS_USING_HOOD_CAMERA", LUA_NATIVE_PLAYER_GET_IS_USING_HOOD_CAMERA); diff --git a/src/lua/natives/lua_native_binding_RECORDING.cpp b/src/lua/natives/lua_native_binding_RECORDING.cpp index ceb1468f..19ad8128 100644 --- a/src/lua/natives/lua_native_binding_RECORDING.cpp +++ b/src/lua/natives/lua_native_binding_RECORDING.cpp @@ -23,9 +23,9 @@ namespace lua::native RECORDING::REPLAY_RECORD_BACK_FOR_TIME(p0, p1, p2); } - static void LUA_NATIVE_RECORDING_REPLAY_CHECK_FOR_EVENT_THIS_FRAME(const char* missionNameLabel, Any p1) + static void LUA_NATIVE_RECORDING_REPLAY_CHECK_FOR_EVENT_THIS_FRAME(sol::stack_object missionNameLabel, Any p1) { - RECORDING::REPLAY_CHECK_FOR_EVENT_THIS_FRAME(missionNameLabel, p1); + RECORDING::REPLAY_CHECK_FOR_EVENT_THIS_FRAME(missionNameLabel.is() ? missionNameLabel.as() : nullptr, p1); } static void LUA_NATIVE_RECORDING_REPLAY_PREVENT_RECORDING_THIS_FRAME() diff --git a/src/lua/natives/lua_native_binding_REPLAY.cpp b/src/lua/natives/lua_native_binding_REPLAY.cpp index 2cbc77c3..a0188c8c 100644 --- a/src/lua/natives/lua_native_binding_REPLAY.cpp +++ b/src/lua/natives/lua_native_binding_REPLAY.cpp @@ -3,9 +3,9 @@ namespace lua::native { - static void LUA_NATIVE_REPLAY_REGISTER_EFFECT_FOR_REPLAY_EDITOR(const char* p0, bool p1) + static void LUA_NATIVE_REPLAY_REGISTER_EFFECT_FOR_REPLAY_EDITOR(sol::stack_object p0, bool p1) { - REPLAY::REGISTER_EFFECT_FOR_REPLAY_EDITOR(p0, p1); + REPLAY::REGISTER_EFFECT_FOR_REPLAY_EDITOR(p0.is() ? p0.as() : nullptr, p1); } static bool LUA_NATIVE_REPLAY_REPLAY_SYSTEM_HAS_REQUESTED_A_SCRIPT_CLEANUP() diff --git a/src/lua/natives/lua_native_binding_SCRIPT.cpp b/src/lua/natives/lua_native_binding_SCRIPT.cpp index e821f17c..7fe1152b 100644 --- a/src/lua/natives/lua_native_binding_SCRIPT.cpp +++ b/src/lua/natives/lua_native_binding_SCRIPT.cpp @@ -3,25 +3,25 @@ namespace lua::native { - static void LUA_NATIVE_SCRIPT_REQUEST_SCRIPT(const char* scriptName) + static void LUA_NATIVE_SCRIPT_REQUEST_SCRIPT(sol::stack_object scriptName) { - SCRIPT::REQUEST_SCRIPT(scriptName); + SCRIPT::REQUEST_SCRIPT(scriptName.is() ? scriptName.as() : nullptr); } - static void LUA_NATIVE_SCRIPT_SET_SCRIPT_AS_NO_LONGER_NEEDED(const char* scriptName) + static void LUA_NATIVE_SCRIPT_SET_SCRIPT_AS_NO_LONGER_NEEDED(sol::stack_object scriptName) { - SCRIPT::SET_SCRIPT_AS_NO_LONGER_NEEDED(scriptName); + SCRIPT::SET_SCRIPT_AS_NO_LONGER_NEEDED(scriptName.is() ? scriptName.as() : nullptr); } - static bool LUA_NATIVE_SCRIPT_HAS_SCRIPT_LOADED(const char* scriptName) + static bool LUA_NATIVE_SCRIPT_HAS_SCRIPT_LOADED(sol::stack_object scriptName) { - auto retval = (bool)SCRIPT::HAS_SCRIPT_LOADED(scriptName); + auto retval = (bool)SCRIPT::HAS_SCRIPT_LOADED(scriptName.is() ? scriptName.as() : nullptr); return retval; } - static bool LUA_NATIVE_SCRIPT_DOES_SCRIPT_EXIST(const char* scriptName) + static bool LUA_NATIVE_SCRIPT_DOES_SCRIPT_EXIST(sol::stack_object scriptName) { - auto retval = (bool)SCRIPT::DOES_SCRIPT_EXIST(scriptName); + auto retval = (bool)SCRIPT::DOES_SCRIPT_EXIST(scriptName.is() ? scriptName.as() : nullptr); return retval; } @@ -179,25 +179,25 @@ namespace lua::native SCRIPT::BG_END_CONTEXT_HASH(contextHash); } - static void LUA_NATIVE_SCRIPT_BG_START_CONTEXT(const char* contextName) + static void LUA_NATIVE_SCRIPT_BG_START_CONTEXT(sol::stack_object contextName) { - SCRIPT::BG_START_CONTEXT(contextName); + SCRIPT::BG_START_CONTEXT(contextName.is() ? contextName.as() : nullptr); } - static void LUA_NATIVE_SCRIPT_BG_END_CONTEXT(const char* contextName) + static void LUA_NATIVE_SCRIPT_BG_END_CONTEXT(sol::stack_object contextName) { - SCRIPT::BG_END_CONTEXT(contextName); + SCRIPT::BG_END_CONTEXT(contextName.is() ? contextName.as() : nullptr); } - static bool LUA_NATIVE_SCRIPT_BG_DOES_LAUNCH_PARAM_EXIST(int scriptIndex, const char* p1) + static bool LUA_NATIVE_SCRIPT_BG_DOES_LAUNCH_PARAM_EXIST(int scriptIndex, sol::stack_object p1) { - auto retval = (bool)SCRIPT::BG_DOES_LAUNCH_PARAM_EXIST(scriptIndex, p1); + auto retval = (bool)SCRIPT::BG_DOES_LAUNCH_PARAM_EXIST(scriptIndex, p1.is() ? p1.as() : nullptr); return retval; } - static int LUA_NATIVE_SCRIPT_BG_GET_LAUNCH_PARAM_VALUE(int scriptIndex, const char* p1) + static int LUA_NATIVE_SCRIPT_BG_GET_LAUNCH_PARAM_VALUE(int scriptIndex, sol::stack_object p1) { - auto retval = SCRIPT::BG_GET_LAUNCH_PARAM_VALUE(scriptIndex, p1); + auto retval = SCRIPT::BG_GET_LAUNCH_PARAM_VALUE(scriptIndex, p1.is() ? p1.as() : nullptr); return retval; } @@ -207,7 +207,7 @@ namespace lua::native return retval; } - static Any LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT_NEW_(int eventGroup, Any eventData, int eventDataSize, int playerBits, int eventType) + static Any LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT_NEW_(int eventGroup, Any eventData, int eventDataSize, int playerBits, Hash eventType) { SCRIPT::_SEND_TU_SCRIPT_EVENT_NEW(eventGroup, &eventData, eventDataSize, playerBits, eventType); return eventData; diff --git a/src/lua/natives/lua_native_binding_SOCIALCLUB.cpp b/src/lua/natives/lua_native_binding_SOCIALCLUB.cpp index 0271a55c..1f88daa9 100644 --- a/src/lua/natives/lua_native_binding_SOCIALCLUB.cpp +++ b/src/lua/natives/lua_native_binding_SOCIALCLUB.cpp @@ -27,25 +27,25 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_INT(int p0, const char* context, int out) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_INT(int p0, sol::stack_object context, int out) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_INT(p0, context, &out); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_INT(p0, context.is() ? context.as() : nullptr, &out); std::get<1>(return_values) = out; return return_values; } - static bool LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_BOOL(int p0, const char* p1) + static bool LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_BOOL(int p0, sol::stack_object p1) { - auto retval = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_BOOL(p0, p1); + auto retval = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_BOOL(p0, p1.is() ? p1.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_STRING(int p0, const char* context, char out) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_DATA_STRING(int p0, sol::stack_object context, char out) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_STRING(p0, context, &out); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_INBOX_MESSAGE_GET_DATA_STRING(p0, context.is() ? context.as() : nullptr, &out); std::get<1>(return_values) = out; return return_values; @@ -136,9 +136,9 @@ namespace lua::native SOCIALCLUB::SC_EMAIL_MESSAGE_CLEAR_RECIP_LIST(); } - static void LUA_NATIVE_SOCIALCLUB_SC_EMAIL_SEND_EMAIL(const char* p0) + static void LUA_NATIVE_SOCIALCLUB_SC_EMAIL_SEND_EMAIL(sol::stack_object p0) { - SOCIALCLUB::SC_EMAIL_SEND_EMAIL(p0); + SOCIALCLUB::SC_EMAIL_SEND_EMAIL(p0.is() ? p0.as() : nullptr); } static bool LUA_NATIVE_SOCIALCLUB_SC_EMAIL_SET_CURRENT_EMAIL_TAG(Any p0) @@ -176,9 +176,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_SOCIALCLUB_SC_PRESENCE_ATTR_SET_STRING(Hash attrHash, const char* value) + static bool LUA_NATIVE_SOCIALCLUB_SC_PRESENCE_ATTR_SET_STRING(Hash attrHash, sol::stack_object value) { - auto retval = (bool)SOCIALCLUB::SC_PRESENCE_ATTR_SET_STRING(attrHash, value); + auto retval = (bool)SOCIALCLUB::SC_PRESENCE_ATTR_SET_STRING(attrHash, value.is() ? value.as() : nullptr); return retval; } @@ -188,34 +188,34 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_INT(const char* name, int value) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_INT(sol::stack_object name, int value) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_INT(name, &value); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_INT(name.is() ? name.as() : nullptr, &value); std::get<1>(return_values) = value; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_FLOAT(const char* name, float value) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_FLOAT(sol::stack_object name, float value) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_FLOAT(name, &value); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_FLOAT(name.is() ? name.as() : nullptr, &value); std::get<1>(return_values) = value; return return_values; } - static bool LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_BOOL(const char* name) + static bool LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_BOOL(sol::stack_object name) { - auto retval = (bool)SOCIALCLUB::SC_GAMERDATA_GET_BOOL(name); + auto retval = (bool)SOCIALCLUB::SC_GAMERDATA_GET_BOOL(name.is() ? name.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_STRING(const char* name, char value) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_GAMERDATA_GET_STRING(sol::stack_object name, char value) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_STRING(name, &value); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_GAMERDATA_GET_STRING(name.is() ? name.as() : nullptr, &value); std::get<1>(return_values) = value; return return_values; @@ -230,19 +230,19 @@ namespace lua::native return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_PROFANITY_CHECK_STRING(const char* string, int token) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_PROFANITY_CHECK_STRING(sol::stack_object string, int token) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_PROFANITY_CHECK_STRING(string, &token); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_PROFANITY_CHECK_STRING(string.is() ? string.as() : nullptr, &token); std::get<1>(return_values) = token; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_PROFANITY_CHECK_STRING_UGC(const char* string, int token) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_PROFANITY_CHECK_STRING_UGC(sol::stack_object string, int token) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_PROFANITY_CHECK_STRING_UGC(string, &token); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_PROFANITY_CHECK_STRING_UGC(string.is() ? string.as() : nullptr, &token); std::get<1>(return_values) = token; return return_values; @@ -272,10 +272,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_CHECK_STRING(const char* p0, int p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_CHECK_STRING(sol::stack_object p0, int p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_CHECK_STRING(p0, &p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_CHECK_STRING(p0.is() ? p0.as() : nullptr, &p1); std::get<1>(return_values) = p1; return return_values; @@ -311,19 +311,19 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_SET_PLATE_DATA(const char* oldPlateText, const char* newPlateText, Any plateData) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_SET_PLATE_DATA(sol::stack_object oldPlateText, sol::stack_object newPlateText, Any plateData) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_SET_PLATE_DATA(oldPlateText, newPlateText, &plateData); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_SET_PLATE_DATA(oldPlateText.is() ? oldPlateText.as() : nullptr, newPlateText.is() ? newPlateText.as() : nullptr, &plateData); std::get<1>(return_values) = plateData; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_ADD(const char* plateText, Any plateData, int token) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_ADD(sol::stack_object plateText, Any plateData, int token) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_ADD(plateText, &plateData, &token); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_ADD(plateText.is() ? plateText.as() : nullptr, &plateData, &token); std::get<1>(return_values) = plateData; std::get<2>(return_values) = token; @@ -342,10 +342,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_ISVALID(const char* plateText, int token) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_LICENSEPLATE_ISVALID(sol::stack_object plateText, int token) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_ISVALID(plateText, &token); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_LICENSEPLATE_ISVALID(plateText.is() ? plateText.as() : nullptr, &token); std::get<1>(return_values) = token; return return_values; @@ -375,28 +375,28 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT(const char* p0, int p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT(sol::stack_object p0, int p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT(p0, &p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT(p0.is() ? p0.as() : nullptr, &p1); std::get<1>(return_values) = p1; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT(const char* p0, float p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT(sol::stack_object p0, float p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT(p0, &p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT(p0.is() ? p0.as() : nullptr, &p1); std::get<1>(return_values) = p1; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING(const char* p0, char p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING(sol::stack_object p0, char p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING(p0, &p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING(p0.is() ? p0.as() : nullptr, &p1); std::get<1>(return_values) = p1; return return_values; @@ -411,49 +411,49 @@ namespace lua::native return return_values; } - static bool LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_IS_ACTIVE_FOR_TYPE(const char* p0) + static bool LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_IS_ACTIVE_FOR_TYPE(sol::stack_object p0) { - auto retval = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_IS_ACTIVE_FOR_TYPE(p0); + auto retval = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_IS_ACTIVE_FOR_TYPE(p0.is() ? p0.as() : nullptr); return retval; } - static int LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EVENT_ID_FOR_TYPE(const char* p0) + static int LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EVENT_ID_FOR_TYPE(sol::stack_object p0) { - auto retval = SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EVENT_ID_FOR_TYPE(p0); + auto retval = SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EVENT_ID_FOR_TYPE(p0.is() ? p0.as() : nullptr); return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_FOR_TYPE(const char* p0, int p1, const char* p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_FOR_TYPE(sol::stack_object p0, int p1, sol::stack_object p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_FOR_TYPE(p0, &p1, p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_FOR_TYPE(p0.is() ? p0.as() : nullptr, &p1, p2.is() ? p2.as() : nullptr); std::get<1>(return_values) = p1; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_FOR_TYPE(const char* p0, float p1, const char* p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_FOR_TYPE(sol::stack_object p0, float p1, sol::stack_object p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_FOR_TYPE(p0, &p1, p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_FOR_TYPE(p0.is() ? p0.as() : nullptr, &p1, p2.is() ? p2.as() : nullptr); std::get<1>(return_values) = p1; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_FOR_TYPE(const char* p0, char p1, const char* p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_FOR_TYPE(sol::stack_object p0, char p1, sol::stack_object p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_FOR_TYPE(p0, &p1, p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_FOR_TYPE(p0.is() ? p0.as() : nullptr, &p1, p2.is() ? p2.as() : nullptr); std::get<1>(return_values) = p1; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_DISPLAY_NAME_FOR_TYPE(char p0, const char* p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_DISPLAY_NAME_FOR_TYPE(char p0, sol::stack_object p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_DISPLAY_NAME_FOR_TYPE(&p0, p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_DISPLAY_NAME_FOR_TYPE(&p0, p1.is() ? p1.as() : nullptr); std::get<1>(return_values) = p0; return return_values; @@ -465,28 +465,28 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_BY_ID(int p0, const char* p1, int p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_BY_ID(int p0, sol::stack_object p1, int p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_BY_ID(p0, p1, &p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_INT_BY_ID(p0, p1.is() ? p1.as() : nullptr, &p2); std::get<1>(return_values) = p2; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_BY_ID(int p0, const char* p1, float p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_BY_ID(int p0, sol::stack_object p1, float p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_BY_ID(p0, p1, &p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_FLOAT_BY_ID(p0, p1.is() ? p1.as() : nullptr, &p2); std::get<1>(return_values) = p2; return return_values; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_BY_ID(int p0, const char* p1, char p2) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_BY_ID(int p0, sol::stack_object p1, char p2) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_BY_ID(p0, p1, &p2); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_COMMUNITY_EVENT_GET_EXTRA_DATA_STRING_BY_ID(p0, p1.is() ? p1.as() : nullptr, &p2); std::get<1>(return_values) = p2; return return_values; @@ -525,10 +525,10 @@ namespace lua::native return retval; } - static std::tuple LUA_NATIVE_SOCIALCLUB_SC_TRANSITION_NEWS_GET_EXTRA_DATA_INT_TU(const char* p0, int p1) + static std::tuple LUA_NATIVE_SOCIALCLUB_SC_TRANSITION_NEWS_GET_EXTRA_DATA_INT_TU(sol::stack_object p0, int p1) { std::tuple return_values; - std::get<0>(return_values) = (bool)SOCIALCLUB::SC_TRANSITION_NEWS_GET_EXTRA_DATA_INT_TU(p0, &p1); + std::get<0>(return_values) = (bool)SOCIALCLUB::SC_TRANSITION_NEWS_GET_EXTRA_DATA_INT_TU(p0.is() ? p0.as() : nullptr, &p1); std::get<1>(return_values) = p1; return return_values; diff --git a/src/lua/natives/lua_native_binding_STATS.cpp b/src/lua/natives/lua_native_binding_STATS.cpp index 2efbde1b..736f3e10 100644 --- a/src/lua/natives/lua_native_binding_STATS.cpp +++ b/src/lua/natives/lua_native_binding_STATS.cpp @@ -131,9 +131,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_STATS_STAT_SET_GXT_LABEL(Hash statName, const char* value, bool save) + static bool LUA_NATIVE_STATS_STAT_SET_GXT_LABEL(Hash statName, sol::stack_object value, bool save) { - auto retval = (bool)STATS::STAT_SET_GXT_LABEL(statName, value, save); + auto retval = (bool)STATS::STAT_SET_GXT_LABEL(statName, value.is() ? value.as() : nullptr, save); return retval; } @@ -146,9 +146,9 @@ namespace lua::native return return_values; } - static bool LUA_NATIVE_STATS_STAT_SET_STRING(Hash statName, const char* value, bool save) + static bool LUA_NATIVE_STATS_STAT_SET_STRING(Hash statName, sol::stack_object value, bool save) { - auto retval = (bool)STATS::STAT_SET_STRING(statName, value, save); + auto retval = (bool)STATS::STAT_SET_STRING(statName, value.is() ? value.as() : nullptr, save); return retval; } @@ -164,9 +164,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_STATS_STAT_SET_USER_ID(Hash statName, const char* value, bool save) + static bool LUA_NATIVE_STATS_STAT_SET_USER_ID(Hash statName, sol::stack_object value, bool save) { - auto retval = (bool)STATS::STAT_SET_USER_ID(statName, value, save); + auto retval = (bool)STATS::STAT_SET_USER_ID(statName, value.is() ? value.as() : nullptr, save); return retval; } @@ -250,9 +250,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_STATS_STAT_SET_LICENSE_PLATE(Hash statName, const char* str) + static bool LUA_NATIVE_STATS_STAT_SET_LICENSE_PLATE(Hash statName, sol::stack_object str) { - auto retval = (bool)STATS::STAT_SET_LICENSE_PLATE(statName, str); + auto retval = (bool)STATS::STAT_SET_LICENSE_PLATE(statName, str.is() ? str.as() : nullptr); return retval; } @@ -344,9 +344,9 @@ namespace lua::native return retval; } - static Hash LUA_NATIVE_STATS_GET_PACKED_NG_INT_STAT_KEY(int index, bool spStat, bool charStat, int character, const char* section) + static Hash LUA_NATIVE_STATS_GET_PACKED_NG_INT_STAT_KEY(int index, bool spStat, bool charStat, int character, sol::stack_object section) { - auto retval = STATS::GET_PACKED_NG_INT_STAT_KEY(index, spStat, charStat, character, section); + auto retval = STATS::GET_PACKED_NG_INT_STAT_KEY(index, spStat, charStat, character, section.is() ? section.as() : nullptr); return retval; } @@ -372,19 +372,24 @@ namespace lua::native STATS::SET_PACKED_STAT_INT_CODE(index, value, characterSlot); } - static void LUA_NATIVE_STATS_PLAYSTATS_BACKGROUND_SCRIPT_ACTION(const char* action, int value) + static void LUA_NATIVE_STATS_PLAYSTATS_BACKGROUND_SCRIPT_ACTION(sol::stack_object action, int value) { - STATS::PLAYSTATS_BACKGROUND_SCRIPT_ACTION(action, value); + STATS::PLAYSTATS_BACKGROUND_SCRIPT_ACTION(action.is() ? action.as() : nullptr, value); } - static void LUA_NATIVE_STATS_PLAYSTATS_FLOW_LOW_(float posX, float posY, float posZ, const char* p3, Any p4, int amount) + static void LUA_NATIVE_STATS_PLAYSTATS_FLOW_LOW_(float posX, float posY, float posZ, sol::stack_object p3, Any p4, int amount) { - STATS::_PLAYSTATS_FLOW_LOW(posX, posY, posZ, p3, p4, amount); + STATS::_PLAYSTATS_FLOW_LOW(posX, posY, posZ, p3.is() ? p3.as() : nullptr, p4, amount); } - static void LUA_NATIVE_STATS_PLAYSTATS_NPC_INVITE(const char* p0) + static void LUA_NATIVE_STATS_PLAYSTATS_FLOW_MEDIUM_(float x, float y, float z, sol::stack_object interiorAction, int p4, Hash p5) { - STATS::PLAYSTATS_NPC_INVITE(p0); + STATS::_PLAYSTATS_FLOW_MEDIUM(x, y, z, interiorAction.is() ? interiorAction.as() : nullptr, p4, p5); + } + + static void LUA_NATIVE_STATS_PLAYSTATS_NPC_INVITE(sol::stack_object p0) + { + STATS::PLAYSTATS_NPC_INVITE(p0.is() ? p0.as() : nullptr); } static void LUA_NATIVE_STATS_PLAYSTATS_AWARD_XP(int amount, Hash type, Hash category) @@ -402,9 +407,9 @@ namespace lua::native STATS::PLAYSTATS_STARTED_SESSION_IN_OFFLINEMODE(); } - static void LUA_NATIVE_STATS_PLAYSTATS_ACTIVITY_DONE(int p0, int activityId, int unkHash) + static void LUA_NATIVE_STATS_PLAYSTATS_ACTIVITY_DONE(int p0, int activityId, Any p2) { - STATS::PLAYSTATS_ACTIVITY_DONE(p0, activityId, unkHash); + STATS::PLAYSTATS_ACTIVITY_DONE(p0, activityId, p2); } static void LUA_NATIVE_STATS_PLAYSTATS_LEAVE_JOB_CHAIN(Any p0, Any p1, Any p2, Any p3, Any p4) @@ -412,24 +417,24 @@ namespace lua::native STATS::PLAYSTATS_LEAVE_JOB_CHAIN(p0, p1, p2, p3, p4); } - static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_STARTED(const char* p0, Any p1, Any p2, bool p3) + static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_STARTED(sol::stack_object p0, Any p1, Any p2, bool p3) { - STATS::PLAYSTATS_MISSION_STARTED(p0, p1, p2, p3); + STATS::PLAYSTATS_MISSION_STARTED(p0.is() ? p0.as() : nullptr, p1, p2, p3); } - static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_OVER(const char* p0, Any p1, Any p2, bool p3, bool p4, bool p5) + static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_OVER(sol::stack_object p0, Any p1, Any p2, bool p3, bool p4, bool p5) { - STATS::PLAYSTATS_MISSION_OVER(p0, p1, p2, p3, p4, p5); + STATS::PLAYSTATS_MISSION_OVER(p0.is() ? p0.as() : nullptr, p1, p2, p3, p4, p5); } - static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_CHECKPOINT(const char* p0, Any p1, Any p2, Any p3) + static void LUA_NATIVE_STATS_PLAYSTATS_MISSION_CHECKPOINT(sol::stack_object p0, Any p1, Any p2, Any p3) { - STATS::PLAYSTATS_MISSION_CHECKPOINT(p0, p1, p2, p3); + STATS::PLAYSTATS_MISSION_CHECKPOINT(p0.is() ? p0.as() : nullptr, p1, p2, p3); } - static void LUA_NATIVE_STATS_PLAYSTATS_RANDOM_MISSION_DONE(const char* name, Any p1, Any p2, Any p3) + static void LUA_NATIVE_STATS_PLAYSTATS_RANDOM_MISSION_DONE(sol::stack_object name, Any p1, Any p2, Any p3) { - STATS::PLAYSTATS_RANDOM_MISSION_DONE(name, p1, p2, p3); + STATS::PLAYSTATS_RANDOM_MISSION_DONE(name.is() ? name.as() : nullptr, p1, p2, p3); } static void LUA_NATIVE_STATS_PLAYSTATS_ROS_BET(int amount, int act, Player player, float cm) @@ -522,9 +527,9 @@ namespace lua::native STATS::PLAYSTATS_WEAPON_MODE_CHANGE(weaponHash, componentHashTo, componentHashFrom); } - static void LUA_NATIVE_STATS_PLAYSTATS_CHEAT_APPLIED(const char* cheat) + static void LUA_NATIVE_STATS_PLAYSTATS_CHEAT_APPLIED(sol::stack_object cheat) { - STATS::PLAYSTATS_CHEAT_APPLIED(cheat); + STATS::PLAYSTATS_CHEAT_APPLIED(cheat.is() ? cheat.as() : nullptr); } static std::tuple LUA_NATIVE_STATS_PLAYSTATS_JOB_ACTIVITY_END(Any p0, Any p1, Any p2, Any p3) @@ -575,9 +580,9 @@ namespace lua::native return return_values; } - static void LUA_NATIVE_STATS_PLAYSTATS_QUICKFIX_TOOL(int element, const char* item) + static void LUA_NATIVE_STATS_PLAYSTATS_QUICKFIX_TOOL(int element, sol::stack_object item) { - STATS::PLAYSTATS_QUICKFIX_TOOL(element, item); + STATS::PLAYSTATS_QUICKFIX_TOOL(element, item.is() ? item.as() : nullptr); } static void LUA_NATIVE_STATS_PLAYSTATS_IDLE_KICK(int msStoodIdle) @@ -803,10 +808,10 @@ namespace lua::native return return_values; } - static std::tuple LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_PLAFORM(Any p0, const char* gamerHandleCsv, const char* platformName) + static std::tuple LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_PLAFORM(Any p0, sol::stack_object gamerHandleCsv, sol::stack_object platformName) { std::tuple return_values; - std::get<0>(return_values) = (bool)STATS::LEADERBOARDS2_READ_BY_PLAFORM(&p0, gamerHandleCsv, platformName); + std::get<0>(return_values) = (bool)STATS::LEADERBOARDS2_READ_BY_PLAFORM(&p0, gamerHandleCsv.is() ? gamerHandleCsv.as() : nullptr, platformName.is() ? platformName.as() : nullptr); std::get<1>(return_values) = p0; return return_values; @@ -922,9 +927,9 @@ namespace lua::native STATS::PRESENCE_EVENT_UPDATESTAT_FLOAT(statHash, value, p2); } - static void LUA_NATIVE_STATS_PRESENCE_EVENT_UPDATESTAT_INT_WITH_STRING(Hash statHash, int value, int p2, const char* string) + static void LUA_NATIVE_STATS_PRESENCE_EVENT_UPDATESTAT_INT_WITH_STRING(Hash statHash, int value, int p2, sol::stack_object string) { - STATS::PRESENCE_EVENT_UPDATESTAT_INT_WITH_STRING(statHash, value, p2, string); + STATS::PRESENCE_EVENT_UPDATESTAT_INT_WITH_STRING(statHash, value, p2, string.is() ? string.as() : nullptr); } static bool LUA_NATIVE_STATS_GET_PLAYER_HAS_DRIVEN_ALL_VEHICLES() @@ -1008,9 +1013,9 @@ namespace lua::native STATS::STAT_MIGRATE_CLEAR_FOR_RESTART(); } - static bool LUA_NATIVE_STATS_STAT_MIGRATE_SAVEGAME_START(const char* platformName) + static bool LUA_NATIVE_STATS_STAT_MIGRATE_SAVEGAME_START(sol::stack_object platformName) { - auto retval = (bool)STATS::STAT_MIGRATE_SAVEGAME_START(platformName); + auto retval = (bool)STATS::STAT_MIGRATE_SAVEGAME_START(platformName.is() ? platformName.as() : nullptr); return retval; } @@ -1068,9 +1073,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_STATS_STAT_SAVE_MIGRATION_CONSUME_CONTENT(Hash contentId, const char* srcPlatform, const char* srcGamerHandle) + static bool LUA_NATIVE_STATS_STAT_SAVE_MIGRATION_CONSUME_CONTENT(Hash contentId, sol::stack_object srcPlatform, sol::stack_object srcGamerHandle) { - auto retval = (bool)STATS::STAT_SAVE_MIGRATION_CONSUME_CONTENT(contentId, srcPlatform, srcGamerHandle); + auto retval = (bool)STATS::STAT_SAVE_MIGRATION_CONSUME_CONTENT(contentId, srcPlatform.is() ? srcPlatform.as() : nullptr, srcGamerHandle.is() ? srcGamerHandle.as() : nullptr); return retval; } @@ -1842,6 +1847,12 @@ namespace lua::native STATS::_PLAYSTATS_RANDOM_EVENT(p0); } + static Any LUA_NATIVE_STATS_PLAYSTATS_ALERT_(Any data) + { + STATS::_PLAYSTATS_ALERT(&data); + return data; + } + static void LUA_NATIVE_STATS_PLAYSTATS_ATTRITION_STAGE_END_(Any p0) { STATS::_PLAYSTATS_ATTRITION_STAGE_END(p0); @@ -1922,6 +1933,7 @@ namespace lua::native STATS.set_function("SET_PACKED_STAT_INT_CODE", LUA_NATIVE_STATS_SET_PACKED_STAT_INT_CODE); STATS.set_function("PLAYSTATS_BACKGROUND_SCRIPT_ACTION", LUA_NATIVE_STATS_PLAYSTATS_BACKGROUND_SCRIPT_ACTION); STATS.set_function("PLAYSTATS_FLOW_LOW_", LUA_NATIVE_STATS_PLAYSTATS_FLOW_LOW_); + STATS.set_function("PLAYSTATS_FLOW_MEDIUM_", LUA_NATIVE_STATS_PLAYSTATS_FLOW_MEDIUM_); STATS.set_function("PLAYSTATS_NPC_INVITE", LUA_NATIVE_STATS_PLAYSTATS_NPC_INVITE); STATS.set_function("PLAYSTATS_AWARD_XP", LUA_NATIVE_STATS_PLAYSTATS_AWARD_XP); STATS.set_function("PLAYSTATS_RANK_UP", LUA_NATIVE_STATS_PLAYSTATS_RANK_UP); @@ -2180,6 +2192,7 @@ namespace lua::native STATS.set_function("PLAYSTATS_IDLE_", LUA_NATIVE_STATS_PLAYSTATS_IDLE_); STATS.set_function("PLAYSTATS_PLAYER_STYLE_", LUA_NATIVE_STATS_PLAYSTATS_PLAYER_STYLE_); STATS.set_function("PLAYSTATS_RANDOM_EVENT_", LUA_NATIVE_STATS_PLAYSTATS_RANDOM_EVENT_); + STATS.set_function("PLAYSTATS_ALERT_", LUA_NATIVE_STATS_PLAYSTATS_ALERT_); STATS.set_function("PLAYSTATS_ATTRITION_STAGE_END_", LUA_NATIVE_STATS_PLAYSTATS_ATTRITION_STAGE_END_); STATS.set_function("PLAYSTATS_SHOWROOM_NAV_", LUA_NATIVE_STATS_PLAYSTATS_SHOWROOM_NAV_); STATS.set_function("PLAYSTATS_SHOWROOM_OVERVIEW_", LUA_NATIVE_STATS_PLAYSTATS_SHOWROOM_OVERVIEW_); diff --git a/src/lua/natives/lua_native_binding_STREAMING.cpp b/src/lua/natives/lua_native_binding_STREAMING.cpp index 2612e921..20dd9a38 100644 --- a/src/lua/natives/lua_native_binding_STREAMING.cpp +++ b/src/lua/natives/lua_native_binding_STREAMING.cpp @@ -46,9 +46,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_STREAMING_REQUEST_MODELS_IN_ROOM(Interior interior, const char* roomName) + static void LUA_NATIVE_STREAMING_REQUEST_MODELS_IN_ROOM(Interior interior, sol::stack_object roomName) { - STREAMING::REQUEST_MODELS_IN_ROOM(interior, roomName); + STREAMING::REQUEST_MODELS_IN_ROOM(interior, roomName.is() ? roomName.as() : nullptr); } static void LUA_NATIVE_STREAMING_SET_MODEL_AS_NO_LONGER_NEEDED(Hash model) @@ -101,73 +101,73 @@ namespace lua::native STREAMING::REQUEST_ADDITIONAL_COLLISION_AT_COORD(x, y, z); } - static bool LUA_NATIVE_STREAMING_DOES_ANIM_DICT_EXIST(const char* animDict) + static bool LUA_NATIVE_STREAMING_DOES_ANIM_DICT_EXIST(sol::stack_object animDict) { - auto retval = (bool)STREAMING::DOES_ANIM_DICT_EXIST(animDict); + auto retval = (bool)STREAMING::DOES_ANIM_DICT_EXIST(animDict.is() ? animDict.as() : nullptr); return retval; } - static void LUA_NATIVE_STREAMING_REQUEST_ANIM_DICT(const char* animDict) + static void LUA_NATIVE_STREAMING_REQUEST_ANIM_DICT(sol::stack_object animDict) { - STREAMING::REQUEST_ANIM_DICT(animDict); + STREAMING::REQUEST_ANIM_DICT(animDict.is() ? animDict.as() : nullptr); } - static bool LUA_NATIVE_STREAMING_HAS_ANIM_DICT_LOADED(const char* animDict) + static bool LUA_NATIVE_STREAMING_HAS_ANIM_DICT_LOADED(sol::stack_object animDict) { - auto retval = (bool)STREAMING::HAS_ANIM_DICT_LOADED(animDict); + auto retval = (bool)STREAMING::HAS_ANIM_DICT_LOADED(animDict.is() ? animDict.as() : nullptr); return retval; } - static void LUA_NATIVE_STREAMING_REMOVE_ANIM_DICT(const char* animDict) + static void LUA_NATIVE_STREAMING_REMOVE_ANIM_DICT(sol::stack_object animDict) { - STREAMING::REMOVE_ANIM_DICT(animDict); + STREAMING::REMOVE_ANIM_DICT(animDict.is() ? animDict.as() : nullptr); } - static void LUA_NATIVE_STREAMING_REQUEST_ANIM_SET(const char* animSet) + static void LUA_NATIVE_STREAMING_REQUEST_ANIM_SET(sol::stack_object animSet) { - STREAMING::REQUEST_ANIM_SET(animSet); + STREAMING::REQUEST_ANIM_SET(animSet.is() ? animSet.as() : nullptr); } - static bool LUA_NATIVE_STREAMING_HAS_ANIM_SET_LOADED(const char* animSet) + static bool LUA_NATIVE_STREAMING_HAS_ANIM_SET_LOADED(sol::stack_object animSet) { - auto retval = (bool)STREAMING::HAS_ANIM_SET_LOADED(animSet); + auto retval = (bool)STREAMING::HAS_ANIM_SET_LOADED(animSet.is() ? animSet.as() : nullptr); return retval; } - static void LUA_NATIVE_STREAMING_REMOVE_ANIM_SET(const char* animSet) + static void LUA_NATIVE_STREAMING_REMOVE_ANIM_SET(sol::stack_object animSet) { - STREAMING::REMOVE_ANIM_SET(animSet); + STREAMING::REMOVE_ANIM_SET(animSet.is() ? animSet.as() : nullptr); } - static void LUA_NATIVE_STREAMING_REQUEST_CLIP_SET(const char* clipSet) + static void LUA_NATIVE_STREAMING_REQUEST_CLIP_SET(sol::stack_object clipSet) { - STREAMING::REQUEST_CLIP_SET(clipSet); + STREAMING::REQUEST_CLIP_SET(clipSet.is() ? clipSet.as() : nullptr); } - static bool LUA_NATIVE_STREAMING_HAS_CLIP_SET_LOADED(const char* clipSet) + static bool LUA_NATIVE_STREAMING_HAS_CLIP_SET_LOADED(sol::stack_object clipSet) { - auto retval = (bool)STREAMING::HAS_CLIP_SET_LOADED(clipSet); + auto retval = (bool)STREAMING::HAS_CLIP_SET_LOADED(clipSet.is() ? clipSet.as() : nullptr); return retval; } - static void LUA_NATIVE_STREAMING_REMOVE_CLIP_SET(const char* clipSet) + static void LUA_NATIVE_STREAMING_REMOVE_CLIP_SET(sol::stack_object clipSet) { - STREAMING::REMOVE_CLIP_SET(clipSet); + STREAMING::REMOVE_CLIP_SET(clipSet.is() ? clipSet.as() : nullptr); } - static void LUA_NATIVE_STREAMING_REQUEST_IPL(const char* iplName) + static void LUA_NATIVE_STREAMING_REQUEST_IPL(sol::stack_object iplName) { - STREAMING::REQUEST_IPL(iplName); + STREAMING::REQUEST_IPL(iplName.is() ? iplName.as() : nullptr); } - static void LUA_NATIVE_STREAMING_REMOVE_IPL(const char* iplName) + static void LUA_NATIVE_STREAMING_REMOVE_IPL(sol::stack_object iplName) { - STREAMING::REMOVE_IPL(iplName); + STREAMING::REMOVE_IPL(iplName.is() ? iplName.as() : nullptr); } - static bool LUA_NATIVE_STREAMING_IS_IPL_ACTIVE(const char* iplName) + static bool LUA_NATIVE_STREAMING_IS_IPL_ACTIVE(sol::stack_object iplName) { - auto retval = (bool)STREAMING::IS_IPL_ACTIVE(iplName); + auto retval = (bool)STREAMING::IS_IPL_ACTIVE(iplName.is() ? iplName.as() : nullptr); return retval; } @@ -229,20 +229,20 @@ namespace lua::native STREAMING::REMOVE_PTFX_ASSET(); } - static void LUA_NATIVE_STREAMING_REQUEST_NAMED_PTFX_ASSET(const char* fxName) + static void LUA_NATIVE_STREAMING_REQUEST_NAMED_PTFX_ASSET(sol::stack_object fxName) { - STREAMING::REQUEST_NAMED_PTFX_ASSET(fxName); + STREAMING::REQUEST_NAMED_PTFX_ASSET(fxName.is() ? fxName.as() : nullptr); } - static bool LUA_NATIVE_STREAMING_HAS_NAMED_PTFX_ASSET_LOADED(const char* fxName) + static bool LUA_NATIVE_STREAMING_HAS_NAMED_PTFX_ASSET_LOADED(sol::stack_object fxName) { - auto retval = (bool)STREAMING::HAS_NAMED_PTFX_ASSET_LOADED(fxName); + auto retval = (bool)STREAMING::HAS_NAMED_PTFX_ASSET_LOADED(fxName.is() ? fxName.as() : nullptr); return retval; } - static void LUA_NATIVE_STREAMING_REMOVE_NAMED_PTFX_ASSET(const char* fxName) + static void LUA_NATIVE_STREAMING_REMOVE_NAMED_PTFX_ASSET(sol::stack_object fxName) { - STREAMING::REMOVE_NAMED_PTFX_ASSET(fxName); + STREAMING::REMOVE_NAMED_PTFX_ASSET(fxName.is() ? fxName.as() : nullptr); } static void LUA_NATIVE_STREAMING_SET_VEHICLE_POPULATION_BUDGET(int p0) @@ -281,9 +281,9 @@ namespace lua::native STREAMING::SET_RESTORE_FOCUS_ENTITY(p0); } - static void LUA_NATIVE_STREAMING_SET_MAPDATACULLBOX_ENABLED(const char* name, bool toggle) + static void LUA_NATIVE_STREAMING_SET_MAPDATACULLBOX_ENABLED(sol::stack_object name, bool toggle) { - STREAMING::SET_MAPDATACULLBOX_ENABLED(name, toggle); + STREAMING::SET_MAPDATACULLBOX_ENABLED(name.is() ? name.as() : nullptr, toggle); } static void LUA_NATIVE_STREAMING_SET_ALL_MAPDATA_CULLED(Any p0) @@ -423,9 +423,9 @@ namespace lua::native STREAMING::SET_PLAYER_SWITCH_OUTRO(cameraCoordX, cameraCoordY, cameraCoordZ, camRotationX, camRotationY, camRotationZ, camFov, camFarClip, rotationOrder); } - static void LUA_NATIVE_STREAMING_SET_PLAYER_SWITCH_ESTABLISHING_SHOT(const char* name) + static void LUA_NATIVE_STREAMING_SET_PLAYER_SWITCH_ESTABLISHING_SHOT(sol::stack_object name) { - STREAMING::SET_PLAYER_SWITCH_ESTABLISHING_SHOT(name); + STREAMING::SET_PLAYER_SWITCH_ESTABLISHING_SHOT(name.is() ? name.as() : nullptr); } static void LUA_NATIVE_STREAMING_ALLOW_PLAYER_SWITCH_PAN() @@ -534,9 +534,9 @@ namespace lua::native STREAMING::FORCE_ALLOW_TIME_BASED_FADING_THIS_FRAME(); } - static void LUA_NATIVE_STREAMING_IPL_GROUP_SWAP_START(const char* iplName1, const char* iplName2) + static void LUA_NATIVE_STREAMING_IPL_GROUP_SWAP_START(sol::stack_object iplName1, sol::stack_object iplName2) { - STREAMING::IPL_GROUP_SWAP_START(iplName1, iplName2); + STREAMING::IPL_GROUP_SWAP_START(iplName1.is() ? iplName1.as() : nullptr, iplName2.is() ? iplName2.as() : nullptr); } static void LUA_NATIVE_STREAMING_IPL_GROUP_SWAP_CANCEL() @@ -561,9 +561,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_STREAMING_PREFETCH_SRL(const char* srl) + static void LUA_NATIVE_STREAMING_PREFETCH_SRL(sol::stack_object srl) { - STREAMING::PREFETCH_SRL(srl); + STREAMING::PREFETCH_SRL(srl.is() ? srl.as() : nullptr); } static bool LUA_NATIVE_STREAMING_IS_SRL_LOADED() @@ -644,9 +644,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_STREAMING_SET_ISLAND_ENABLED(const char* name, bool toggle) + static void LUA_NATIVE_STREAMING_SET_ISLAND_ENABLED(sol::stack_object name, bool toggle) { - STREAMING::SET_ISLAND_ENABLED(name, toggle); + STREAMING::SET_ISLAND_ENABLED(name.is() ? name.as() : nullptr, toggle); } void init_native_binding_STREAMING(sol::state& L) diff --git a/src/lua/natives/lua_native_binding_SYSTEM.cpp b/src/lua/natives/lua_native_binding_SYSTEM.cpp index 67894511..fe085de5 100644 --- a/src/lua/natives/lua_native_binding_SYSTEM.cpp +++ b/src/lua/natives/lua_native_binding_SYSTEM.cpp @@ -8,16 +8,16 @@ namespace lua::native SYSTEM::WAIT(ms); } - static int LUA_NATIVE_SYSTEM_START_NEW_SCRIPT(const char* scriptName, int stackSize) + static int LUA_NATIVE_SYSTEM_START_NEW_SCRIPT(sol::stack_object scriptName, int stackSize) { - auto retval = SYSTEM::START_NEW_SCRIPT(scriptName, stackSize); + auto retval = SYSTEM::START_NEW_SCRIPT(scriptName.is() ? scriptName.as() : nullptr, stackSize); return retval; } - static std::tuple LUA_NATIVE_SYSTEM_START_NEW_SCRIPT_WITH_ARGS(const char* scriptName, Any args, int argCount, int stackSize) + static std::tuple LUA_NATIVE_SYSTEM_START_NEW_SCRIPT_WITH_ARGS(sol::stack_object scriptName, Any args, int argCount, int stackSize) { std::tuple return_values; - std::get<0>(return_values) = SYSTEM::START_NEW_SCRIPT_WITH_ARGS(scriptName, &args, argCount, stackSize); + std::get<0>(return_values) = SYSTEM::START_NEW_SCRIPT_WITH_ARGS(scriptName.is() ? scriptName.as() : nullptr, &args, argCount, stackSize); std::get<1>(return_values) = args; return return_values; diff --git a/src/lua/natives/lua_native_binding_TASK.cpp b/src/lua/natives/lua_native_binding_TASK.cpp index 5c460578..9e8dde70 100644 --- a/src/lua/natives/lua_native_binding_TASK.cpp +++ b/src/lua/natives/lua_native_binding_TASK.cpp @@ -38,9 +38,9 @@ namespace lua::native TASK::TASK_OPEN_VEHICLE_DOOR(ped, vehicle, timeOut, seat, speed); } - static void LUA_NATIVE_TASK_TASK_ENTER_VEHICLE(Ped ped, Vehicle vehicle, int timeout, int seat, float speed, int flag, const char* overrideEntryClipsetName, bool network_is_activity_session) + static void LUA_NATIVE_TASK_TASK_ENTER_VEHICLE(Ped ped, Vehicle vehicle, int timeout, int seat, float speed, int flag, sol::stack_object overrideEntryClipsetName, Any p7) { - TASK::TASK_ENTER_VEHICLE(ped, vehicle, timeout, seat, speed, flag, overrideEntryClipsetName, network_is_activity_session); + TASK::TASK_ENTER_VEHICLE(ped, vehicle, timeout, seat, speed, flag, overrideEntryClipsetName.is() ? overrideEntryClipsetName.as() : nullptr, p7); } static void LUA_NATIVE_TASK_TASK_LEAVE_VEHICLE(Ped ped, Vehicle vehicle, int flags) @@ -168,9 +168,9 @@ namespace lua::native TASK::TASK_WANDER_STANDARD(ped, heading, flags); } - static void LUA_NATIVE_TASK_TASK_WANDER_SPECIFIC(Ped ped, const char* conditionalAnimGroupStr, const char* conditionalAnimStr, float heading) + static void LUA_NATIVE_TASK_TASK_WANDER_SPECIFIC(Ped ped, sol::stack_object conditionalAnimGroupStr, sol::stack_object conditionalAnimStr, float heading) { - TASK::TASK_WANDER_SPECIFIC(ped, conditionalAnimGroupStr, conditionalAnimStr, heading); + TASK::TASK_WANDER_SPECIFIC(ped, conditionalAnimGroupStr.is() ? conditionalAnimGroupStr.as() : nullptr, conditionalAnimStr.is() ? conditionalAnimStr.as() : nullptr, heading); } static void LUA_NATIVE_TASK_TASK_VEHICLE_PARK(Ped ped, Vehicle vehicle, float x, float y, float z, float heading, int mode, float radius, bool keepEngineOn) @@ -275,19 +275,19 @@ namespace lua::native TASK::TASK_GO_TO_COORD_ANY_MEANS_EXTRA_PARAMS_WITH_CRUISE_SPEED(ped, x, y, z, moveBlendRatio, vehicle, useLongRangeVehiclePathing, drivingFlags, maxRangeToShootTargets, extraVehToTargetDistToPreferVehicle, driveStraightLineDistance, extraFlags, cruiseSpeed, targetArriveDist); } - static void LUA_NATIVE_TASK_TASK_PLAY_ANIM(Ped ped, const char* animDictionary, const char* animationName, float blendInSpeed, float blendOutSpeed, int duration, int flag, float playbackRate, bool lockX, bool lockY, bool lockZ) + static void LUA_NATIVE_TASK_TASK_PLAY_ANIM(Ped ped, sol::stack_object animDictionary, sol::stack_object animationName, float blendInSpeed, float blendOutSpeed, int duration, int flag, float playbackRate, bool lockX, bool lockY, bool lockZ) { - TASK::TASK_PLAY_ANIM(ped, animDictionary, animationName, blendInSpeed, blendOutSpeed, duration, flag, playbackRate, lockX, lockY, lockZ); + TASK::TASK_PLAY_ANIM(ped, animDictionary.is() ? animDictionary.as() : nullptr, animationName.is() ? animationName.as() : nullptr, blendInSpeed, blendOutSpeed, duration, flag, playbackRate, lockX, lockY, lockZ); } - static void LUA_NATIVE_TASK_TASK_PLAY_ANIM_ADVANCED(Ped ped, const char* animDict, const char* animName, float posX, float posY, float posZ, float rotX, float rotY, float rotZ, float animEnterSpeed, float animExitSpeed, int duration, Any flag, float animTime, int rotOrder, int ikFlags) + static void LUA_NATIVE_TASK_TASK_PLAY_ANIM_ADVANCED(Ped ped, sol::stack_object animDict, sol::stack_object animName, float posX, float posY, float posZ, float rotX, float rotY, float rotZ, float animEnterSpeed, float animExitSpeed, int duration, Any flag, float animTime, int rotOrder, int ikFlags) { - TASK::TASK_PLAY_ANIM_ADVANCED(ped, animDict, animName, posX, posY, posZ, rotX, rotY, rotZ, animEnterSpeed, animExitSpeed, duration, flag, animTime, rotOrder, ikFlags); + TASK::TASK_PLAY_ANIM_ADVANCED(ped, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr, posX, posY, posZ, rotX, rotY, rotZ, animEnterSpeed, animExitSpeed, duration, flag, animTime, rotOrder, ikFlags); } - static void LUA_NATIVE_TASK_STOP_ANIM_TASK(Entity entity, const char* animDictionary, const char* animationName, float blendDelta) + static void LUA_NATIVE_TASK_STOP_ANIM_TASK(Entity entity, sol::stack_object animDictionary, sol::stack_object animationName, float blendDelta) { - TASK::STOP_ANIM_TASK(entity, animDictionary, animationName, blendDelta); + TASK::STOP_ANIM_TASK(entity, animDictionary.is() ? animDictionary.as() : nullptr, animationName.is() ? animationName.as() : nullptr, blendDelta); } static std::tuple LUA_NATIVE_TASK_TASK_SCRIPTED_ANIMATION(Ped ped, int priorityLowData, int priorityMidData, int priorityHighData, float blendInDelta, float blendOutDelta) @@ -337,9 +337,9 @@ namespace lua::native TASK::SET_ANIM_LOOPED(entity, looped, priority, secondary); } - static void LUA_NATIVE_TASK_TASK_PLAY_PHONE_GESTURE_ANIMATION(Ped ped, const char* animDict, const char* animation, const char* boneMaskType, float blendInDuration, float blendOutDuration, bool isLooping, bool holdLastFrame) + static void LUA_NATIVE_TASK_TASK_PLAY_PHONE_GESTURE_ANIMATION(Ped ped, sol::stack_object animDict, sol::stack_object animation, sol::stack_object boneMaskType, float blendInDuration, float blendOutDuration, bool isLooping, bool holdLastFrame) { - TASK::TASK_PLAY_PHONE_GESTURE_ANIMATION(ped, animDict, animation, boneMaskType, blendInDuration, blendOutDuration, isLooping, holdLastFrame); + TASK::TASK_PLAY_PHONE_GESTURE_ANIMATION(ped, animDict.is() ? animDict.as() : nullptr, animation.is() ? animation.as() : nullptr, boneMaskType.is() ? boneMaskType.as() : nullptr, blendInDuration, blendOutDuration, isLooping, holdLastFrame); } static void LUA_NATIVE_TASK_TASK_STOP_PHONE_GESTURE_ANIMATION(Ped ped, float blendOutOverride) @@ -365,9 +365,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_TASK_TASK_VEHICLE_PLAY_ANIM(Vehicle vehicle, const char* animationSet, const char* animationName) + static void LUA_NATIVE_TASK_TASK_VEHICLE_PLAY_ANIM(Vehicle vehicle, sol::stack_object animationSet, sol::stack_object animationName) { - TASK::TASK_VEHICLE_PLAY_ANIM(vehicle, animationSet, animationName); + TASK::TASK_VEHICLE_PLAY_ANIM(vehicle, animationSet.is() ? animationSet.as() : nullptr, animationName.is() ? animationName.as() : nullptr); } static void LUA_NATIVE_TASK_TASK_LOOK_AT_COORD(Entity entity, float x, float y, float z, int duration, int flags, int priority) @@ -710,9 +710,9 @@ namespace lua::native TASK::TASK_CLIMB_LADDER(ped, fast); } - static void LUA_NATIVE_TASK_TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(Ped ped, float x1, float y1, float z1, float x2, float y2, float z2, float minZ, int ropeHandle, const char* clipSet, Any p10, Any p11) + static void LUA_NATIVE_TASK_TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(Ped ped, float x1, float y1, float z1, float x2, float y2, float z2, float minZ, int ropeHandle, sol::stack_object clipSet, Any p10, Any p11) { - TASK::TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(ped, x1, y1, z1, x2, y2, z2, minZ, ropeHandle, clipSet, p10, p11); + TASK::TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(ped, x1, y1, z1, x2, y2, z2, minZ, ropeHandle, clipSet.is() ? clipSet.as() : nullptr, p10, p11); } static int LUA_NATIVE_TASK_GET_TASK_RAPPEL_DOWN_WALL_STATE(Ped ped) @@ -875,9 +875,9 @@ namespace lua::native TASK::TASK_GUARD_SPHERE_DEFENSIVE_AREA(ped, defendPositionX, defendPositionY, defendPositionZ, heading, maxPatrolProximity, time, x, y, z, defensiveAreaRadius); } - static void LUA_NATIVE_TASK_TASK_STAND_GUARD(Ped ped, float x, float y, float z, float heading, const char* scenarioName) + static void LUA_NATIVE_TASK_TASK_STAND_GUARD(Ped ped, float x, float y, float z, float heading, sol::stack_object scenarioName) { - TASK::TASK_STAND_GUARD(ped, x, y, z, heading, scenarioName); + TASK::TASK_STAND_GUARD(ped, x, y, z, heading, scenarioName.is() ? scenarioName.as() : nullptr); } static void LUA_NATIVE_TASK_SET_DRIVE_TASK_CRUISE_SPEED(Ped driver, float cruiseSpeed) @@ -915,14 +915,14 @@ namespace lua::native TASK::REMOVE_SPECIFIC_COVER_BLOCKING_AREAS(startX, startY, startZ, endX, endY, endZ, blockObjects, blockVehicles, blockMap, blockPlayer); } - static void LUA_NATIVE_TASK_TASK_START_SCENARIO_IN_PLACE(Ped ped, const char* scenarioName, int unkDelay, bool playEnterAnim) + static void LUA_NATIVE_TASK_TASK_START_SCENARIO_IN_PLACE(Ped ped, sol::stack_object scenarioName, int unkDelay, bool playEnterAnim) { - TASK::TASK_START_SCENARIO_IN_PLACE(ped, scenarioName, unkDelay, playEnterAnim); + TASK::TASK_START_SCENARIO_IN_PLACE(ped, scenarioName.is() ? scenarioName.as() : nullptr, unkDelay, playEnterAnim); } - static void LUA_NATIVE_TASK_TASK_START_SCENARIO_AT_POSITION(Ped ped, const char* scenarioName, float x, float y, float z, float heading, int duration, bool sittingScenario, bool teleport) + static void LUA_NATIVE_TASK_TASK_START_SCENARIO_AT_POSITION(Ped ped, sol::stack_object scenarioName, float x, float y, float z, float heading, int duration, bool sittingScenario, bool teleport) { - TASK::TASK_START_SCENARIO_AT_POSITION(ped, scenarioName, x, y, z, heading, duration, sittingScenario, teleport); + TASK::TASK_START_SCENARIO_AT_POSITION(ped, scenarioName.is() ? scenarioName.as() : nullptr, x, y, z, heading, duration, sittingScenario, teleport); } static void LUA_NATIVE_TASK_TASK_USE_NEAREST_SCENARIO_TO_COORD(Ped ped, float x, float y, float z, float distance, int duration) @@ -951,9 +951,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_TASK_DOES_SCENARIO_OF_TYPE_EXIST_IN_AREA(float x, float y, float z, const char* scenarioName, float radius, bool mustBeFree) + static bool LUA_NATIVE_TASK_DOES_SCENARIO_OF_TYPE_EXIST_IN_AREA(float x, float y, float z, sol::stack_object scenarioName, float radius, bool mustBeFree) { - auto retval = (bool)TASK::DOES_SCENARIO_OF_TYPE_EXIST_IN_AREA(x, y, z, scenarioName, radius, mustBeFree); + auto retval = (bool)TASK::DOES_SCENARIO_OF_TYPE_EXIST_IN_AREA(x, y, z, scenarioName.is() ? scenarioName.as() : nullptr, radius, mustBeFree); return retval; } @@ -969,26 +969,26 @@ namespace lua::native return retval; } - static void LUA_NATIVE_TASK_PLAY_ANIM_ON_RUNNING_SCENARIO(Ped ped, const char* animDict, const char* animName) + static void LUA_NATIVE_TASK_PLAY_ANIM_ON_RUNNING_SCENARIO(Ped ped, sol::stack_object animDict, sol::stack_object animName) { - TASK::PLAY_ANIM_ON_RUNNING_SCENARIO(ped, animDict, animName); + TASK::PLAY_ANIM_ON_RUNNING_SCENARIO(ped, animDict.is() ? animDict.as() : nullptr, animName.is() ? animName.as() : nullptr); } - static bool LUA_NATIVE_TASK_DOES_SCENARIO_GROUP_EXIST(const char* scenarioGroup) + static bool LUA_NATIVE_TASK_DOES_SCENARIO_GROUP_EXIST(sol::stack_object scenarioGroup) { - auto retval = (bool)TASK::DOES_SCENARIO_GROUP_EXIST(scenarioGroup); + auto retval = (bool)TASK::DOES_SCENARIO_GROUP_EXIST(scenarioGroup.is() ? scenarioGroup.as() : nullptr); return retval; } - static bool LUA_NATIVE_TASK_IS_SCENARIO_GROUP_ENABLED(const char* scenarioGroup) + static bool LUA_NATIVE_TASK_IS_SCENARIO_GROUP_ENABLED(sol::stack_object scenarioGroup) { - auto retval = (bool)TASK::IS_SCENARIO_GROUP_ENABLED(scenarioGroup); + auto retval = (bool)TASK::IS_SCENARIO_GROUP_ENABLED(scenarioGroup.is() ? scenarioGroup.as() : nullptr); return retval; } - static void LUA_NATIVE_TASK_SET_SCENARIO_GROUP_ENABLED(const char* scenarioGroup, bool enabled) + static void LUA_NATIVE_TASK_SET_SCENARIO_GROUP_ENABLED(sol::stack_object scenarioGroup, bool enabled) { - TASK::SET_SCENARIO_GROUP_ENABLED(scenarioGroup, enabled); + TASK::SET_SCENARIO_GROUP_ENABLED(scenarioGroup.is() ? scenarioGroup.as() : nullptr, enabled); } static void LUA_NATIVE_TASK_RESET_SCENARIO_GROUPS_ENABLED() @@ -996,9 +996,9 @@ namespace lua::native TASK::RESET_SCENARIO_GROUPS_ENABLED(); } - static void LUA_NATIVE_TASK_SET_EXCLUSIVE_SCENARIO_GROUP(const char* scenarioGroup) + static void LUA_NATIVE_TASK_SET_EXCLUSIVE_SCENARIO_GROUP(sol::stack_object scenarioGroup) { - TASK::SET_EXCLUSIVE_SCENARIO_GROUP(scenarioGroup); + TASK::SET_EXCLUSIVE_SCENARIO_GROUP(scenarioGroup.is() ? scenarioGroup.as() : nullptr); } static void LUA_NATIVE_TASK_RESET_EXCLUSIVE_SCENARIO_GROUP() @@ -1006,15 +1006,15 @@ namespace lua::native TASK::RESET_EXCLUSIVE_SCENARIO_GROUP(); } - static bool LUA_NATIVE_TASK_IS_SCENARIO_TYPE_ENABLED(const char* scenarioType) + static bool LUA_NATIVE_TASK_IS_SCENARIO_TYPE_ENABLED(sol::stack_object scenarioType) { - auto retval = (bool)TASK::IS_SCENARIO_TYPE_ENABLED(scenarioType); + auto retval = (bool)TASK::IS_SCENARIO_TYPE_ENABLED(scenarioType.is() ? scenarioType.as() : nullptr); return retval; } - static void LUA_NATIVE_TASK_SET_SCENARIO_TYPE_ENABLED(const char* scenarioType, bool toggle) + static void LUA_NATIVE_TASK_SET_SCENARIO_TYPE_ENABLED(sol::stack_object scenarioType, bool toggle) { - TASK::SET_SCENARIO_TYPE_ENABLED(scenarioType, toggle); + TASK::SET_SCENARIO_TYPE_ENABLED(scenarioType.is() ? scenarioType.as() : nullptr, toggle); } static void LUA_NATIVE_TASK_RESET_SCENARIO_TYPES_ENABLED() @@ -1086,9 +1086,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_TASK_OPEN_PATROL_ROUTE(const char* patrolRoute) + static void LUA_NATIVE_TASK_OPEN_PATROL_ROUTE(sol::stack_object patrolRoute) { - TASK::OPEN_PATROL_ROUTE(patrolRoute); + TASK::OPEN_PATROL_ROUTE(patrolRoute.is() ? patrolRoute.as() : nullptr); } static void LUA_NATIVE_TASK_CLOSE_PATROL_ROUTE() @@ -1096,9 +1096,9 @@ namespace lua::native TASK::CLOSE_PATROL_ROUTE(); } - static void LUA_NATIVE_TASK_ADD_PATROL_ROUTE_NODE(int nodeId, const char* nodeType, float posX, float posY, float posZ, float headingX, float headingY, float headingZ, int duration) + static void LUA_NATIVE_TASK_ADD_PATROL_ROUTE_NODE(int nodeId, sol::stack_object nodeType, float posX, float posY, float posZ, float headingX, float headingY, float headingZ, int duration) { - TASK::ADD_PATROL_ROUTE_NODE(nodeId, nodeType, posX, posY, posZ, headingX, headingY, headingZ, duration); + TASK::ADD_PATROL_ROUTE_NODE(nodeId, nodeType.is() ? nodeType.as() : nullptr, posX, posY, posZ, headingX, headingY, headingZ, duration); } static void LUA_NATIVE_TASK_ADD_PATROL_ROUTE_LINK(int nodeId1, int nodeId2) @@ -1111,9 +1111,9 @@ namespace lua::native TASK::CREATE_PATROL_ROUTE(); } - static void LUA_NATIVE_TASK_DELETE_PATROL_ROUTE(const char* patrolRoute) + static void LUA_NATIVE_TASK_DELETE_PATROL_ROUTE(sol::stack_object patrolRoute) { - TASK::DELETE_PATROL_ROUTE(patrolRoute); + TASK::DELETE_PATROL_ROUTE(patrolRoute.is() ? patrolRoute.as() : nullptr); } static std::tuple LUA_NATIVE_TASK_GET_PATROL_TASK_INFO(Ped ped, int timeLeftAtNode, int nodeId) @@ -1126,9 +1126,9 @@ namespace lua::native return return_values; } - static void LUA_NATIVE_TASK_TASK_PATROL(Ped ped, const char* patrolRouteName, int alertState, bool canChatToPeds, bool useHeadLookAt) + static void LUA_NATIVE_TASK_TASK_PATROL(Ped ped, sol::stack_object patrolRouteName, int alertState, bool canChatToPeds, bool useHeadLookAt) { - TASK::TASK_PATROL(ped, patrolRouteName, alertState, canChatToPeds, useHeadLookAt); + TASK::TASK_PATROL(ped, patrolRouteName.is() ? patrolRouteName.as() : nullptr, alertState, canChatToPeds, useHeadLookAt); } static void LUA_NATIVE_TASK_TASK_STAY_IN_COVER(Ped ped) @@ -1201,58 +1201,58 @@ namespace lua::native TASK::SET_HIGH_FALL_TASK(ped, minTime, maxTime, entryType); } - static void LUA_NATIVE_TASK_REQUEST_WAYPOINT_RECORDING(const char* name) + static void LUA_NATIVE_TASK_REQUEST_WAYPOINT_RECORDING(sol::stack_object name) { - TASK::REQUEST_WAYPOINT_RECORDING(name); + TASK::REQUEST_WAYPOINT_RECORDING(name.is() ? name.as() : nullptr); } - static bool LUA_NATIVE_TASK_GET_IS_WAYPOINT_RECORDING_LOADED(const char* name) + static bool LUA_NATIVE_TASK_GET_IS_WAYPOINT_RECORDING_LOADED(sol::stack_object name) { - auto retval = (bool)TASK::GET_IS_WAYPOINT_RECORDING_LOADED(name); + auto retval = (bool)TASK::GET_IS_WAYPOINT_RECORDING_LOADED(name.is() ? name.as() : nullptr); return retval; } - static void LUA_NATIVE_TASK_REMOVE_WAYPOINT_RECORDING(const char* name) + static void LUA_NATIVE_TASK_REMOVE_WAYPOINT_RECORDING(sol::stack_object name) { - TASK::REMOVE_WAYPOINT_RECORDING(name); + TASK::REMOVE_WAYPOINT_RECORDING(name.is() ? name.as() : nullptr); } - static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_NUM_POINTS(const char* name, int points) + static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_NUM_POINTS(sol::stack_object name, int points) { std::tuple return_values; - std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_NUM_POINTS(name, &points); + std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_NUM_POINTS(name.is() ? name.as() : nullptr, &points); std::get<1>(return_values) = points; return return_values; } - static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_COORD(const char* name, int point, Vector3 coord) + static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_COORD(sol::stack_object name, int point, Vector3 coord) { std::tuple return_values; - std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_COORD(name, point, &coord); + std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_COORD(name.is() ? name.as() : nullptr, point, &coord); std::get<1>(return_values) = coord; return return_values; } - static float LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_SPEED_AT_POINT(const char* name, int point) + static float LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_SPEED_AT_POINT(sol::stack_object name, int point) { - auto retval = TASK::WAYPOINT_RECORDING_GET_SPEED_AT_POINT(name, point); + auto retval = TASK::WAYPOINT_RECORDING_GET_SPEED_AT_POINT(name.is() ? name.as() : nullptr, point); return retval; } - static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_CLOSEST_WAYPOINT(const char* name, float x, float y, float z, int point) + static std::tuple LUA_NATIVE_TASK_WAYPOINT_RECORDING_GET_CLOSEST_WAYPOINT(sol::stack_object name, float x, float y, float z, int point) { std::tuple return_values; - std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_CLOSEST_WAYPOINT(name, x, y, z, &point); + std::get<0>(return_values) = (bool)TASK::WAYPOINT_RECORDING_GET_CLOSEST_WAYPOINT(name.is() ? name.as() : nullptr, x, y, z, &point); std::get<1>(return_values) = point; return return_values; } - static void LUA_NATIVE_TASK_TASK_FOLLOW_WAYPOINT_RECORDING(Ped ped, const char* name, int p2, int p3, int p4) + static void LUA_NATIVE_TASK_TASK_FOLLOW_WAYPOINT_RECORDING(Ped ped, sol::stack_object name, int p2, int p3, int p4) { - TASK::TASK_FOLLOW_WAYPOINT_RECORDING(ped, name, p2, p3, p4); + TASK::TASK_FOLLOW_WAYPOINT_RECORDING(ped, name.is() ? name.as() : nullptr, p2, p3, p4); } static bool LUA_NATIVE_TASK_IS_WAYPOINT_PLAYBACK_GOING_ON_FOR_PED(Ped ped) @@ -1279,9 +1279,9 @@ namespace lua::native return retval; } - static float LUA_NATIVE_TASK_GET_WAYPOINT_DISTANCE_ALONG_ROUTE(const char* name, int point) + static float LUA_NATIVE_TASK_GET_WAYPOINT_DISTANCE_ALONG_ROUTE(sol::stack_object name, int point) { - auto retval = TASK::GET_WAYPOINT_DISTANCE_ALONG_ROUTE(name, point); + auto retval = TASK::GET_WAYPOINT_DISTANCE_ALONG_ROUTE(name.is() ? name.as() : nullptr, point); return retval; } @@ -1311,9 +1311,9 @@ namespace lua::native TASK::WAYPOINT_PLAYBACK_USE_DEFAULT_SPEED(p0); } - static void LUA_NATIVE_TASK_USE_WAYPOINT_RECORDING_AS_ASSISTED_MOVEMENT_ROUTE(const char* name, bool p1, float p2, float p3) + static void LUA_NATIVE_TASK_USE_WAYPOINT_RECORDING_AS_ASSISTED_MOVEMENT_ROUTE(sol::stack_object name, bool p1, float p2, float p3) { - TASK::USE_WAYPOINT_RECORDING_AS_ASSISTED_MOVEMENT_ROUTE(name, p1, p2, p3); + TASK::USE_WAYPOINT_RECORDING_AS_ASSISTED_MOVEMENT_ROUTE(name.is() ? name.as() : nullptr, p1, p2, p3); } static void LUA_NATIVE_TASK_WAYPOINT_PLAYBACK_START_AIMING_AT_PED(Ped ped, Ped target, bool p2) @@ -1341,25 +1341,25 @@ namespace lua::native TASK::WAYPOINT_PLAYBACK_STOP_AIMING_OR_SHOOTING(ped); } - static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_REQUEST_ROUTE(const char* route) + static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_REQUEST_ROUTE(sol::stack_object route) { - TASK::ASSISTED_MOVEMENT_REQUEST_ROUTE(route); + TASK::ASSISTED_MOVEMENT_REQUEST_ROUTE(route.is() ? route.as() : nullptr); } - static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_REMOVE_ROUTE(const char* route) + static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_REMOVE_ROUTE(sol::stack_object route) { - TASK::ASSISTED_MOVEMENT_REMOVE_ROUTE(route); + TASK::ASSISTED_MOVEMENT_REMOVE_ROUTE(route.is() ? route.as() : nullptr); } - static bool LUA_NATIVE_TASK_ASSISTED_MOVEMENT_IS_ROUTE_LOADED(const char* route) + static bool LUA_NATIVE_TASK_ASSISTED_MOVEMENT_IS_ROUTE_LOADED(sol::stack_object route) { - auto retval = (bool)TASK::ASSISTED_MOVEMENT_IS_ROUTE_LOADED(route); + auto retval = (bool)TASK::ASSISTED_MOVEMENT_IS_ROUTE_LOADED(route.is() ? route.as() : nullptr); return retval; } - static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_SET_ROUTE_PROPERTIES(const char* route, int props) + static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_SET_ROUTE_PROPERTIES(sol::stack_object route, int props) { - TASK::ASSISTED_MOVEMENT_SET_ROUTE_PROPERTIES(route, props); + TASK::ASSISTED_MOVEMENT_SET_ROUTE_PROPERTIES(route.is() ? route.as() : nullptr, props); } static void LUA_NATIVE_TASK_ASSISTED_MOVEMENT_OVERRIDE_LOAD_DISTANCE_THIS_FRAME(float dist) @@ -1367,9 +1367,9 @@ namespace lua::native TASK::ASSISTED_MOVEMENT_OVERRIDE_LOAD_DISTANCE_THIS_FRAME(dist); } - static void LUA_NATIVE_TASK_TASK_VEHICLE_FOLLOW_WAYPOINT_RECORDING(Ped ped, Vehicle vehicle, const char* WPRecording, int p3, int p4, int p5, int p6, float p7, bool p8, float p9) + static void LUA_NATIVE_TASK_TASK_VEHICLE_FOLLOW_WAYPOINT_RECORDING(Ped ped, Vehicle vehicle, sol::stack_object WPRecording, int p3, int p4, int p5, int p6, float p7, bool p8, float p9) { - TASK::TASK_VEHICLE_FOLLOW_WAYPOINT_RECORDING(ped, vehicle, WPRecording, p3, p4, p5, p6, p7, p8, p9); + TASK::TASK_VEHICLE_FOLLOW_WAYPOINT_RECORDING(ped, vehicle, WPRecording.is() ? WPRecording.as() : nullptr, p3, p4, p5, p6, p7, p8, p9); } static bool LUA_NATIVE_TASK_IS_WAYPOINT_PLAYBACK_GOING_ON_FOR_VEHICLE(Vehicle vehicle) @@ -1420,25 +1420,25 @@ namespace lua::native TASK::TASK_FORCE_MOTION_STATE(ped, state, forceRestart); } - static void LUA_NATIVE_TASK_TASK_MOVE_NETWORK_BY_NAME(Ped ped, const char* task, float multiplier, bool allowOverrideCloneUpdate, const char* animDict, int flags) + static void LUA_NATIVE_TASK_TASK_MOVE_NETWORK_BY_NAME(Ped ped, sol::stack_object task, float multiplier, bool allowOverrideCloneUpdate, sol::stack_object animDict, int flags) { - TASK::TASK_MOVE_NETWORK_BY_NAME(ped, task, multiplier, allowOverrideCloneUpdate, animDict, flags); + TASK::TASK_MOVE_NETWORK_BY_NAME(ped, task.is() ? task.as() : nullptr, multiplier, allowOverrideCloneUpdate, animDict.is() ? animDict.as() : nullptr, flags); } - static void LUA_NATIVE_TASK_TASK_MOVE_NETWORK_ADVANCED_BY_NAME(Ped ped, const char* network, float x, float y, float z, float rotX, float rotY, float rotZ, int rotOrder, float blendDuration, bool allowOverrideCloneUpdate, const char* animDict, int flags) + static void LUA_NATIVE_TASK_TASK_MOVE_NETWORK_ADVANCED_BY_NAME(Ped ped, sol::stack_object network, float x, float y, float z, float rotX, float rotY, float rotZ, int rotOrder, float blendDuration, bool allowOverrideCloneUpdate, sol::stack_object animDict, int flags) { - TASK::TASK_MOVE_NETWORK_ADVANCED_BY_NAME(ped, network, x, y, z, rotX, rotY, rotZ, rotOrder, blendDuration, allowOverrideCloneUpdate, animDict, flags); + TASK::TASK_MOVE_NETWORK_ADVANCED_BY_NAME(ped, network.is() ? network.as() : nullptr, x, y, z, rotX, rotY, rotZ, rotOrder, blendDuration, allowOverrideCloneUpdate, animDict.is() ? animDict.as() : nullptr, flags); } - static int LUA_NATIVE_TASK_TASK_MOVE_NETWORK_BY_NAME_WITH_INIT_PARAMS(Ped ped, const char* network, int initialParameters, float blendDuration, bool allowOverrideCloneUpdate, const char* animDict, int flags) + static int LUA_NATIVE_TASK_TASK_MOVE_NETWORK_BY_NAME_WITH_INIT_PARAMS(Ped ped, sol::stack_object network, int initialParameters, float blendDuration, bool allowOverrideCloneUpdate, sol::stack_object animDict, int flags) { - TASK::TASK_MOVE_NETWORK_BY_NAME_WITH_INIT_PARAMS(ped, network, &initialParameters, blendDuration, allowOverrideCloneUpdate, animDict, flags); + TASK::TASK_MOVE_NETWORK_BY_NAME_WITH_INIT_PARAMS(ped, network.is() ? network.as() : nullptr, &initialParameters, blendDuration, allowOverrideCloneUpdate, animDict.is() ? animDict.as() : nullptr, flags); return initialParameters; } - static int LUA_NATIVE_TASK_TASK_MOVE_NETWORK_ADVANCED_BY_NAME_WITH_INIT_PARAMS(Ped ped, const char* network, int initialParameters, float x, float y, float z, float rotX, float rotY, float rotZ, int rotOrder, float blendDuration, bool allowOverrideCloneUpdate, const char* dictionary, int flags) + static int LUA_NATIVE_TASK_TASK_MOVE_NETWORK_ADVANCED_BY_NAME_WITH_INIT_PARAMS(Ped ped, sol::stack_object network, int initialParameters, float x, float y, float z, float rotX, float rotY, float rotZ, int rotOrder, float blendDuration, bool allowOverrideCloneUpdate, sol::stack_object dictionary, int flags) { - TASK::TASK_MOVE_NETWORK_ADVANCED_BY_NAME_WITH_INIT_PARAMS(ped, network, &initialParameters, x, y, z, rotX, rotY, rotZ, rotOrder, blendDuration, allowOverrideCloneUpdate, dictionary, flags); + TASK::TASK_MOVE_NETWORK_ADVANCED_BY_NAME_WITH_INIT_PARAMS(ped, network.is() ? network.as() : nullptr, &initialParameters, x, y, z, rotX, rotY, rotZ, rotOrder, blendDuration, allowOverrideCloneUpdate, dictionary.is() ? dictionary.as() : nullptr, flags); return initialParameters; } @@ -1454,15 +1454,15 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_TASK_REQUEST_TASK_MOVE_NETWORK_STATE_TRANSITION(Ped ped, const char* name) + static bool LUA_NATIVE_TASK_REQUEST_TASK_MOVE_NETWORK_STATE_TRANSITION(Ped ped, sol::stack_object name) { - auto retval = (bool)TASK::REQUEST_TASK_MOVE_NETWORK_STATE_TRANSITION(ped, name); + auto retval = (bool)TASK::REQUEST_TASK_MOVE_NETWORK_STATE_TRANSITION(ped, name.is() ? name.as() : nullptr); return retval; } - static bool LUA_NATIVE_TASK_SET_EXPECTED_CLONE_NEXT_TASK_MOVE_NETWORK_STATE(Ped ped, const char* state) + static bool LUA_NATIVE_TASK_SET_EXPECTED_CLONE_NEXT_TASK_MOVE_NETWORK_STATE(Ped ped, sol::stack_object state) { - auto retval = (bool)TASK::SET_EXPECTED_CLONE_NEXT_TASK_MOVE_NETWORK_STATE(ped, state); + auto retval = (bool)TASK::SET_EXPECTED_CLONE_NEXT_TASK_MOVE_NETWORK_STATE(ped, state.is() ? state.as() : nullptr); return retval; } @@ -1477,41 +1477,41 @@ namespace lua::native TASK::SET_TASK_MOVE_NETWORK_ANIM_SET(ped, clipSet, variableClipSet); } - static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, const char* signalName, float value) + static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, sol::stack_object signalName, float value) { - TASK::SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(ped, signalName, value); + TASK::SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(ped, signalName.is() ? signalName.as() : nullptr, value); } - static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_LOCAL_FLOAT(Ped ped, const char* signalName, float value) + static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_LOCAL_FLOAT(Ped ped, sol::stack_object signalName, float value) { - TASK::SET_TASK_MOVE_NETWORK_SIGNAL_LOCAL_FLOAT(ped, signalName, value); + TASK::SET_TASK_MOVE_NETWORK_SIGNAL_LOCAL_FLOAT(ped, signalName.is() ? signalName.as() : nullptr, value); } - static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT_LERP_RATE(Ped ped, const char* signalName, float value) + static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT_LERP_RATE(Ped ped, sol::stack_object signalName, float value) { - TASK::SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT_LERP_RATE(ped, signalName, value); + TASK::SET_TASK_MOVE_NETWORK_SIGNAL_FLOAT_LERP_RATE(ped, signalName.is() ? signalName.as() : nullptr, value); } - static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_BOOL(Ped ped, const char* signalName, bool value) + static void LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_SIGNAL_BOOL(Ped ped, sol::stack_object signalName, bool value) { - TASK::SET_TASK_MOVE_NETWORK_SIGNAL_BOOL(ped, signalName, value); + TASK::SET_TASK_MOVE_NETWORK_SIGNAL_BOOL(ped, signalName.is() ? signalName.as() : nullptr, value); } - static float LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, const char* signalName) + static float LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(Ped ped, sol::stack_object signalName) { - auto retval = TASK::GET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(ped, signalName); + auto retval = TASK::GET_TASK_MOVE_NETWORK_SIGNAL_FLOAT(ped, signalName.is() ? signalName.as() : nullptr); return retval; } - static bool LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_SIGNAL_BOOL(Ped ped, const char* signalName) + static bool LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_SIGNAL_BOOL(Ped ped, sol::stack_object signalName) { - auto retval = (bool)TASK::GET_TASK_MOVE_NETWORK_SIGNAL_BOOL(ped, signalName); + auto retval = (bool)TASK::GET_TASK_MOVE_NETWORK_SIGNAL_BOOL(ped, signalName.is() ? signalName.as() : nullptr); return retval; } - static bool LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_EVENT(Ped ped, const char* eventName) + static bool LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_EVENT(Ped ped, sol::stack_object eventName) { - auto retval = (bool)TASK::GET_TASK_MOVE_NETWORK_EVENT(ped, eventName); + auto retval = (bool)TASK::GET_TASK_MOVE_NETWORK_EVENT(ped, eventName.is() ? eventName.as() : nullptr); return retval; } @@ -1521,6 +1521,11 @@ namespace lua::native return retval; } + static void LUA_NATIVE_TASK_SET_SCRIPT_TASK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED_(Ped ped, bool enable) + { + TASK::_SET_SCRIPT_TASK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED(ped, enable); + } + static bool LUA_NATIVE_TASK_IS_MOVE_BLEND_RATIO_STILL(Ped ped) { auto retval = (bool)TASK::IS_MOVE_BLEND_RATIO_STILL(ped); @@ -1575,9 +1580,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_TASK_TASK_SYNCHRONIZED_SCENE(Ped ped, int scene, const char* animDictionary, const char* animationName, float blendIn, float blendOut, int flags, int ragdollBlockingFlags, float moverBlendDelta, int ikFlags) + static void LUA_NATIVE_TASK_TASK_SYNCHRONIZED_SCENE(Ped ped, int scene, sol::stack_object animDictionary, sol::stack_object animationName, float blendIn, float blendOut, int flags, int ragdollBlockingFlags, float moverBlendDelta, int ikFlags) { - TASK::TASK_SYNCHRONIZED_SCENE(ped, scene, animDictionary, animationName, blendIn, blendOut, flags, ragdollBlockingFlags, moverBlendDelta, ikFlags); + TASK::TASK_SYNCHRONIZED_SCENE(ped, scene, animDictionary.is() ? animDictionary.as() : nullptr, animationName.is() ? animationName.as() : nullptr, blendIn, blendOut, flags, ragdollBlockingFlags, moverBlendDelta, ikFlags); } static void LUA_NATIVE_TASK_TASK_AGITATED_ACTION_CONFRONT_RESPONSE(Ped ped, Ped ped2) @@ -1585,9 +1590,9 @@ namespace lua::native TASK::TASK_AGITATED_ACTION_CONFRONT_RESPONSE(ped, ped2); } - static void LUA_NATIVE_TASK_TASK_SWEEP_AIM_ENTITY(Ped ped, const char* animDict, const char* lowAnimName, const char* medAnimName, const char* hiAnimName, int runtime, Entity targetEntity, float turnRate, float blendInDuration) + static void LUA_NATIVE_TASK_TASK_SWEEP_AIM_ENTITY(Ped ped, sol::stack_object animDict, sol::stack_object lowAnimName, sol::stack_object medAnimName, sol::stack_object hiAnimName, int runtime, Entity targetEntity, float turnRate, float blendInDuration) { - TASK::TASK_SWEEP_AIM_ENTITY(ped, animDict, lowAnimName, medAnimName, hiAnimName, runtime, targetEntity, turnRate, blendInDuration); + TASK::TASK_SWEEP_AIM_ENTITY(ped, animDict.is() ? animDict.as() : nullptr, lowAnimName.is() ? lowAnimName.as() : nullptr, medAnimName.is() ? medAnimName.as() : nullptr, hiAnimName.is() ? hiAnimName.as() : nullptr, runtime, targetEntity, turnRate, blendInDuration); } static void LUA_NATIVE_TASK_UPDATE_TASK_SWEEP_AIM_ENTITY(Ped ped, Entity entity) @@ -1595,9 +1600,9 @@ namespace lua::native TASK::UPDATE_TASK_SWEEP_AIM_ENTITY(ped, entity); } - static void LUA_NATIVE_TASK_TASK_SWEEP_AIM_POSITION(Ped ped, const char* animDict, const char* lowAnimName, const char* medAnimName, const char* hiAnimName, int runtime, float x, float y, float z, float turnRate, float blendInDuration) + static void LUA_NATIVE_TASK_TASK_SWEEP_AIM_POSITION(Ped ped, sol::stack_object animDict, sol::stack_object lowAnimName, sol::stack_object medAnimName, sol::stack_object hiAnimName, int runtime, float x, float y, float z, float turnRate, float blendInDuration) { - TASK::TASK_SWEEP_AIM_POSITION(ped, animDict, lowAnimName, medAnimName, hiAnimName, runtime, x, y, z, turnRate, blendInDuration); + TASK::TASK_SWEEP_AIM_POSITION(ped, animDict.is() ? animDict.as() : nullptr, lowAnimName.is() ? lowAnimName.as() : nullptr, medAnimName.is() ? medAnimName.as() : nullptr, hiAnimName.is() ? hiAnimName.as() : nullptr, runtime, x, y, z, turnRate, blendInDuration); } static void LUA_NATIVE_TASK_UPDATE_TASK_SWEEP_AIM_POSITION(Ped ped, float x, float y, float z) @@ -1922,6 +1927,7 @@ namespace lua::native TASK.set_function("GET_TASK_MOVE_NETWORK_SIGNAL_BOOL", LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_SIGNAL_BOOL); TASK.set_function("GET_TASK_MOVE_NETWORK_EVENT", LUA_NATIVE_TASK_GET_TASK_MOVE_NETWORK_EVENT); TASK.set_function("SET_TASK_MOVE_NETWORK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED", LUA_NATIVE_TASK_SET_TASK_MOVE_NETWORK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED); + TASK.set_function("SET_SCRIPT_TASK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED_", LUA_NATIVE_TASK_SET_SCRIPT_TASK_ENABLE_COLLISION_ON_NETWORK_CLONE_WHEN_FIXED_); TASK.set_function("IS_MOVE_BLEND_RATIO_STILL", LUA_NATIVE_TASK_IS_MOVE_BLEND_RATIO_STILL); TASK.set_function("IS_MOVE_BLEND_RATIO_WALKING", LUA_NATIVE_TASK_IS_MOVE_BLEND_RATIO_WALKING); TASK.set_function("IS_MOVE_BLEND_RATIO_RUNNING", LUA_NATIVE_TASK_IS_MOVE_BLEND_RATIO_RUNNING); diff --git a/src/lua/natives/lua_native_binding_VEHICLE.cpp b/src/lua/natives/lua_native_binding_VEHICLE.cpp index db3a7679..5b525e08 100644 --- a/src/lua/natives/lua_native_binding_VEHICLE.cpp +++ b/src/lua/natives/lua_native_binding_VEHICLE.cpp @@ -256,6 +256,17 @@ namespace lua::native VEHICLE::SET_VEHICLE_DONT_TERMINATE_TASK_WHEN_ACHIEVED(vehicle); } + static void LUA_NATIVE_VEHICLE_SET_VEHICLE_MAX_LAUNCH_ENGINE_REVS_(Vehicle vehicle, float modifier) + { + VEHICLE::_SET_VEHICLE_MAX_LAUNCH_ENGINE_REVS(vehicle, modifier); + } + + static float LUA_NATIVE_VEHICLE_GET_VEHICLE_THROTTLE_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_VEHICLE_THROTTLE(vehicle); + return retval; + } + static void LUA_NATIVE_VEHICLE_EXPLODE_VEHICLE(Vehicle vehicle, bool isAudible, bool isInvisible) { VEHICLE::EXPLODE_VEHICLE(vehicle, isAudible, isInvisible); @@ -309,9 +320,9 @@ namespace lua::native return retval; } - static bool LUA_NATIVE_VEHICLE_IS_VEHICLE_IN_GARAGE_AREA(const char* garageName, Vehicle vehicle) + static bool LUA_NATIVE_VEHICLE_IS_VEHICLE_IN_GARAGE_AREA(sol::stack_object garageName, Vehicle vehicle) { - auto retval = (bool)VEHICLE::IS_VEHICLE_IN_GARAGE_AREA(garageName, vehicle); + auto retval = (bool)VEHICLE::IS_VEHICLE_IN_GARAGE_AREA(garageName.is() ? garageName.as() : nullptr, vehicle); return retval; } @@ -855,9 +866,9 @@ namespace lua::native VEHICLE::SET_VEHICLE_TYRE_FIXED(vehicle, tyreIndex); } - static void LUA_NATIVE_VEHICLE_SET_VEHICLE_NUMBER_PLATE_TEXT(Vehicle vehicle, const char* plateText) + static void LUA_NATIVE_VEHICLE_SET_VEHICLE_NUMBER_PLATE_TEXT(Vehicle vehicle, sol::stack_object plateText) { - VEHICLE::SET_VEHICLE_NUMBER_PLATE_TEXT(vehicle, plateText); + VEHICLE::SET_VEHICLE_NUMBER_PLATE_TEXT(vehicle, plateText.is() ? plateText.as() : nullptr); } static const char* LUA_NATIVE_VEHICLE_GET_VEHICLE_NUMBER_PLATE_TEXT(Vehicle vehicle) @@ -945,26 +956,26 @@ namespace lua::native return retval; } - static int LUA_NATIVE_VEHICLE_GET_VEHICLE_RECORDING_ID(int recording, const char* script) + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_RECORDING_ID(int recording, sol::stack_object script) { - auto retval = VEHICLE::GET_VEHICLE_RECORDING_ID(recording, script); + auto retval = VEHICLE::GET_VEHICLE_RECORDING_ID(recording, script.is() ? script.as() : nullptr); return retval; } - static void LUA_NATIVE_VEHICLE_REQUEST_VEHICLE_RECORDING(int recording, const char* script) + static void LUA_NATIVE_VEHICLE_REQUEST_VEHICLE_RECORDING(int recording, sol::stack_object script) { - VEHICLE::REQUEST_VEHICLE_RECORDING(recording, script); + VEHICLE::REQUEST_VEHICLE_RECORDING(recording, script.is() ? script.as() : nullptr); } - static bool LUA_NATIVE_VEHICLE_HAS_VEHICLE_RECORDING_BEEN_LOADED(int recording, const char* script) + static bool LUA_NATIVE_VEHICLE_HAS_VEHICLE_RECORDING_BEEN_LOADED(int recording, sol::stack_object script) { - auto retval = (bool)VEHICLE::HAS_VEHICLE_RECORDING_BEEN_LOADED(recording, script); + auto retval = (bool)VEHICLE::HAS_VEHICLE_RECORDING_BEEN_LOADED(recording, script.is() ? script.as() : nullptr); return retval; } - static void LUA_NATIVE_VEHICLE_REMOVE_VEHICLE_RECORDING(int recording, const char* script) + static void LUA_NATIVE_VEHICLE_REMOVE_VEHICLE_RECORDING(int recording, sol::stack_object script) { - VEHICLE::REMOVE_VEHICLE_RECORDING(recording, script); + VEHICLE::REMOVE_VEHICLE_RECORDING(recording, script.is() ? script.as() : nullptr); } static Vector3 LUA_NATIVE_VEHICLE_GET_POSITION_OF_VEHICLE_RECORDING_ID_AT_TIME(int id, float time) @@ -973,9 +984,9 @@ namespace lua::native return retval; } - static Vector3 LUA_NATIVE_VEHICLE_GET_POSITION_OF_VEHICLE_RECORDING_AT_TIME(int recording, float time, const char* script) + static Vector3 LUA_NATIVE_VEHICLE_GET_POSITION_OF_VEHICLE_RECORDING_AT_TIME(int recording, float time, sol::stack_object script) { - auto retval = VEHICLE::GET_POSITION_OF_VEHICLE_RECORDING_AT_TIME(recording, time, script); + auto retval = VEHICLE::GET_POSITION_OF_VEHICLE_RECORDING_AT_TIME(recording, time, script.is() ? script.as() : nullptr); return retval; } @@ -985,9 +996,9 @@ namespace lua::native return retval; } - static Vector3 LUA_NATIVE_VEHICLE_GET_ROTATION_OF_VEHICLE_RECORDING_AT_TIME(int recording, float time, const char* script) + static Vector3 LUA_NATIVE_VEHICLE_GET_ROTATION_OF_VEHICLE_RECORDING_AT_TIME(int recording, float time, sol::stack_object script) { - auto retval = VEHICLE::GET_ROTATION_OF_VEHICLE_RECORDING_AT_TIME(recording, time, script); + auto retval = VEHICLE::GET_ROTATION_OF_VEHICLE_RECORDING_AT_TIME(recording, time, script.is() ? script.as() : nullptr); return retval; } @@ -997,9 +1008,9 @@ namespace lua::native return retval; } - static float LUA_NATIVE_VEHICLE_GET_TOTAL_DURATION_OF_VEHICLE_RECORDING(int recording, const char* script) + static float LUA_NATIVE_VEHICLE_GET_TOTAL_DURATION_OF_VEHICLE_RECORDING(int recording, sol::stack_object script) { - auto retval = VEHICLE::GET_TOTAL_DURATION_OF_VEHICLE_RECORDING(recording, script); + auto retval = VEHICLE::GET_TOTAL_DURATION_OF_VEHICLE_RECORDING(recording, script.is() ? script.as() : nullptr); return retval; } @@ -1015,14 +1026,14 @@ namespace lua::native return retval; } - static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE(Vehicle vehicle, int recording, const char* script, bool p3) + static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE(Vehicle vehicle, int recording, sol::stack_object script, bool p3) { - VEHICLE::START_PLAYBACK_RECORDED_VEHICLE(vehicle, recording, script, p3); + VEHICLE::START_PLAYBACK_RECORDED_VEHICLE(vehicle, recording, script.is() ? script.as() : nullptr, p3); } - static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE_WITH_FLAGS(Vehicle vehicle, int recording, const char* script, int flags, int time, int drivingStyle) + static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE_WITH_FLAGS(Vehicle vehicle, int recording, sol::stack_object script, int flags, int time, int drivingStyle) { - VEHICLE::START_PLAYBACK_RECORDED_VEHICLE_WITH_FLAGS(vehicle, recording, script, flags, time, drivingStyle); + VEHICLE::START_PLAYBACK_RECORDED_VEHICLE_WITH_FLAGS(vehicle, recording, script.is() ? script.as() : nullptr, flags, time, drivingStyle); } static void LUA_NATIVE_VEHICLE_FORCE_PLAYBACK_RECORDED_VEHICLE_UPDATE(Vehicle vehicle, bool p1) @@ -1073,9 +1084,9 @@ namespace lua::native VEHICLE::SET_PLAYBACK_SPEED(vehicle, speed); } - static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE_USING_AI(Vehicle vehicle, int recording, const char* script, float speed, int drivingStyle) + static void LUA_NATIVE_VEHICLE_START_PLAYBACK_RECORDED_VEHICLE_USING_AI(Vehicle vehicle, int recording, sol::stack_object script, float speed, int drivingStyle) { - VEHICLE::START_PLAYBACK_RECORDED_VEHICLE_USING_AI(vehicle, recording, script, speed, drivingStyle); + VEHICLE::START_PLAYBACK_RECORDED_VEHICLE_USING_AI(vehicle, recording, script.is() ? script.as() : nullptr, speed, drivingStyle); } static void LUA_NATIVE_VEHICLE_SKIP_TIME_IN_PLAYBACK_RECORDED_VEHICLE(Vehicle vehicle, float time) @@ -1911,9 +1922,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_VEHICLE_SET_VEHICLE_NAME_DEBUG(Vehicle vehicle, const char* name) + static void LUA_NATIVE_VEHICLE_SET_VEHICLE_NAME_DEBUG(Vehicle vehicle, sol::stack_object name) { - VEHICLE::SET_VEHICLE_NAME_DEBUG(vehicle, name); + VEHICLE::SET_VEHICLE_NAME_DEBUG(vehicle, name.is() ? name.as() : nullptr); } static void LUA_NATIVE_VEHICLE_SET_VEHICLE_EXPLODES_ON_HIGH_EXPLOSION_DAMAGE(Vehicle vehicle, bool toggle) @@ -1964,6 +1975,30 @@ namespace lua::native VEHICLE::REQUEST_VEHICLE_HIGH_DETAIL_MODEL(vehicle); } + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_MODEL_NUM_DRIVE_GEARS_(Hash vehicleModel) + { + auto retval = VEHICLE::_GET_VEHICLE_MODEL_NUM_DRIVE_GEARS(vehicleModel); + return retval; + } + + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_MAX_DRIVE_GEAR_COUNT_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_VEHICLE_MAX_DRIVE_GEAR_COUNT(vehicle); + return retval; + } + + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_CURRENT_DRIVE_GEAR_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_VEHICLE_CURRENT_DRIVE_GEAR(vehicle); + return retval; + } + + static float LUA_NATIVE_VEHICLE_GET_VEHICLE_CURRENT_REV_RATIO_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_VEHICLE_CURRENT_REV_RATIO(vehicle); + return retval; + } + static void LUA_NATIVE_VEHICLE_REMOVE_VEHICLE_HIGH_DETAIL_MODEL(Vehicle vehicle) { VEHICLE::REMOVE_VEHICLE_HIGH_DETAIL_MODEL(vehicle); @@ -1996,6 +2031,11 @@ namespace lua::native VEHICLE::SET_VEHICLE_TOW_TRUCK_ARM_POSITION(vehicle, position); } + static void LUA_NATIVE_VEHICLE_SET_ATTACHED_VEHICLE_TO_TOW_TRUCK_ARM_(Vehicle towTruck, Vehicle vehicle) + { + VEHICLE::_SET_ATTACHED_VEHICLE_TO_TOW_TRUCK_ARM(towTruck, vehicle); + } + static void LUA_NATIVE_VEHICLE_ATTACH_VEHICLE_TO_TOW_TRUCK(Vehicle towTruck, Vehicle vehicle, bool rear, float hookOffsetX, float hookOffsetY, float hookOffsetZ) { VEHICLE::ATTACH_VEHICLE_TO_TOW_TRUCK(towTruck, vehicle, rear, hookOffsetX, hookOffsetY, hookOffsetZ); @@ -2594,6 +2634,17 @@ namespace lua::native VEHICLE::OVERRIDE_PLANE_DAMAGE_THREHSOLD(vehicle, health); } + static void LUA_NATIVE_VEHICLE_SET_TRANSMISSION_REDUCED_GEAR_RATIO_(Vehicle vehicle, bool toggle) + { + VEHICLE::_SET_TRANSMISSION_REDUCED_GEAR_RATIO(vehicle, toggle); + } + + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_DESIRED_DRIVE_GEAR_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_VEHICLE_DESIRED_DRIVE_GEAR(vehicle); + return retval; + } + static bool LUA_NATIVE_VEHICLE_GET_IS_LEFT_VEHICLE_HEADLIGHT_DAMAGED(Vehicle vehicle) { auto retval = (bool)VEHICLE::GET_IS_LEFT_VEHICLE_HEADLIGHT_DAMAGED(vehicle); @@ -2978,9 +3029,9 @@ namespace lua::native return retval; } - static void LUA_NATIVE_VEHICLE_ATTACH_VEHICLE_TO_CARGOBOB(Vehicle vehicle, Vehicle cargobob, int p2, float x, float y, float z) + static void LUA_NATIVE_VEHICLE_ATTACH_VEHICLE_TO_CARGOBOB(Vehicle cargobob, Vehicle vehicle, int p2, float x, float y, float z) { - VEHICLE::ATTACH_VEHICLE_TO_CARGOBOB(vehicle, cargobob, p2, x, y, z); + VEHICLE::ATTACH_VEHICLE_TO_CARGOBOB(cargobob, vehicle, p2, x, y, z); } static void LUA_NATIVE_VEHICLE_ATTACH_ENTITY_TO_CARGOBOB(Any p0, Any p1, Any p2, Any p3, Any p4, Any p5) @@ -3227,9 +3278,9 @@ namespace lua::native VEHICLE::CLEAR_VEHICLE_ROUTE_HISTORY(vehicle); } - static Vehicle LUA_NATIVE_VEHICLE_DOES_VEHICLE_EXIST_WITH_DECORATOR(const char* decorator) + static Vehicle LUA_NATIVE_VEHICLE_DOES_VEHICLE_EXIST_WITH_DECORATOR(sol::stack_object decorator) { - auto retval = VEHICLE::DOES_VEHICLE_EXIST_WITH_DECORATOR(decorator); + auto retval = VEHICLE::DOES_VEHICLE_EXIST_WITH_DECORATOR(decorator.is() ? decorator.as() : nullptr); return retval; } @@ -3682,6 +3733,11 @@ namespace lua::native VEHICLE::SET_VEHICLE_USE_BOOST_BUTTON_FOR_WHEEL_RETRACT(toggle); } + static void LUA_NATIVE_VEHICLE_SET_VEHICLE_USE_HORN_BUTTON_FOR_NITROUS_(bool toggle) + { + VEHICLE::_SET_VEHICLE_USE_HORN_BUTTON_FOR_NITROUS(toggle); + } + static void LUA_NATIVE_VEHICLE_VEHICLE_SET_PARACHUTE_MODEL_OVERRIDE(Vehicle vehicle, Hash modelHash) { VEHICLE::VEHICLE_SET_PARACHUTE_MODEL_OVERRIDE(vehicle, modelHash); @@ -3969,6 +4025,48 @@ namespace lua::native VEHICLE::SET_OVERRIDE_NITROUS_LEVEL(vehicle, toggle, level, power, rechargeTime, disableSound); } + static void LUA_NATIVE_VEHICLE_SET_NITROUS_IS_ACTIVE(Vehicle vehicle, bool enabled) + { + VEHICLE::SET_NITROUS_IS_ACTIVE(vehicle, enabled); + } + + static void LUA_NATIVE_VEHICLE_SET_OVERRIDE_TRACTION_LOSS_MULTIPLIER_(Vehicle vehicle, float modifier) + { + VEHICLE::_SET_OVERRIDE_TRACTION_LOSS_MULTIPLIER(vehicle, modifier); + } + + static void LUA_NATIVE_VEHICLE_SET_DRIFT_SLIP_ANGLE_LIMITS_(Vehicle vehicle, float durationScalar, float amplitudeScalar, float slipAngleLimit) + { + VEHICLE::_SET_DRIFT_SLIP_ANGLE_LIMITS(vehicle, durationScalar, amplitudeScalar, slipAngleLimit); + } + + static void LUA_NATIVE_VEHICLE_SET_MINIMUM_TIME_BETWEEN_GEAR_SHIFTS_(Vehicle vehicle, int time) + { + VEHICLE::_SET_MINIMUM_TIME_BETWEEN_GEAR_SHIFTS(vehicle, time); + } + + static void LUA_NATIVE_VEHICLE_FULLY_CHARGE_NITROUS(Vehicle vehicle) + { + VEHICLE::FULLY_CHARGE_NITROUS(vehicle); + } + + static float LUA_NATIVE_VEHICLE_GET_REMAINING_NITROUS_DURATION_(Vehicle vehicle) + { + auto retval = VEHICLE::_GET_REMAINING_NITROUS_DURATION(vehicle); + return retval; + } + + static bool LUA_NATIVE_VEHICLE_IS_NITROUS_ACTIVE(Vehicle vehicle) + { + auto retval = (bool)VEHICLE::IS_NITROUS_ACTIVE(vehicle); + return retval; + } + + static void LUA_NATIVE_VEHICLE_CLEAR_NITROUS(Vehicle vehicle) + { + VEHICLE::CLEAR_NITROUS(vehicle); + } + static void LUA_NATIVE_VEHICLE_SET_INCREASE_WHEEL_CRUSH_DAMAGE(Vehicle vehicle, bool toggle) { VEHICLE::SET_INCREASE_WHEEL_CRUSH_DAMAGE(vehicle, toggle); @@ -3995,6 +4093,11 @@ namespace lua::native VEHICLE::HIDE_TOMBSTONE(vehicle, toggle); } + static void LUA_NATIVE_VEHICLE_APPLY_EMP_EFFECT(Vehicle vehicle) + { + VEHICLE::APPLY_EMP_EFFECT(vehicle); + } + static bool LUA_NATIVE_VEHICLE_GET_IS_VEHICLE_DISABLED_BY_EMP(Vehicle vehicle) { auto retval = (bool)VEHICLE::GET_IS_VEHICLE_DISABLED_BY_EMP(vehicle); @@ -4069,6 +4172,33 @@ namespace lua::native VEHICLE::SET_CHECK_FOR_ENOUGH_ROOM_FOR_PED(vehicle, p1); } + static void LUA_NATIVE_VEHICLE_SET_ALLOW_COLLISION_WHEN_IN_VEHICLE_(Vehicle vehicle, bool toggle) + { + VEHICLE::_SET_ALLOW_COLLISION_WHEN_IN_VEHICLE(vehicle, toggle); + } + + static bool LUA_NATIVE_VEHICLE_IS_VEHICLE_GEN9_EXCLUSIVE_MODEL_(Hash vehicleModel) + { + auto retval = (bool)VEHICLE::_IS_VEHICLE_GEN9_EXCLUSIVE_MODEL(vehicleModel); + return retval; + } + + static int LUA_NATIVE_VEHICLE_GET_VEHICLE_MAX_EXHAUST_BONE_COUNT_() + { + auto retval = VEHICLE::_GET_VEHICLE_MAX_EXHAUST_BONE_COUNT(); + return retval; + } + + static std::tuple LUA_NATIVE_VEHICLE_GET_VEHICLE_EXHAUST_BONE_(Vehicle vehicle, int index, int boneIndex, bool axisX) + { + std::tuple return_values; + std::get<0>(return_values) = (bool)VEHICLE::_GET_VEHICLE_EXHAUST_BONE(vehicle, index, &boneIndex, (BOOL*)&axisX); + std::get<1>(return_values) = boneIndex; + std::get<2>(return_values) = axisX; + + return return_values; + } + void init_native_binding_VEHICLE(sol::state& L) { auto VEHICLE = L["VEHICLE"].get_or_create(); @@ -4119,6 +4249,8 @@ namespace lua::native VEHICLE.set_function("SET_VEHICLE_DOORS_LOCKED_FOR_TEAM", LUA_NATIVE_VEHICLE_SET_VEHICLE_DOORS_LOCKED_FOR_TEAM); VEHICLE.set_function("SET_VEHICLE_DOORS_LOCKED_FOR_ALL_TEAMS", LUA_NATIVE_VEHICLE_SET_VEHICLE_DOORS_LOCKED_FOR_ALL_TEAMS); VEHICLE.set_function("SET_VEHICLE_DONT_TERMINATE_TASK_WHEN_ACHIEVED", LUA_NATIVE_VEHICLE_SET_VEHICLE_DONT_TERMINATE_TASK_WHEN_ACHIEVED); + VEHICLE.set_function("SET_VEHICLE_MAX_LAUNCH_ENGINE_REVS_", LUA_NATIVE_VEHICLE_SET_VEHICLE_MAX_LAUNCH_ENGINE_REVS_); + VEHICLE.set_function("GET_VEHICLE_THROTTLE_", LUA_NATIVE_VEHICLE_GET_VEHICLE_THROTTLE_); VEHICLE.set_function("EXPLODE_VEHICLE", LUA_NATIVE_VEHICLE_EXPLODE_VEHICLE); VEHICLE.set_function("SET_VEHICLE_OUT_OF_CONTROL", LUA_NATIVE_VEHICLE_SET_VEHICLE_OUT_OF_CONTROL); VEHICLE.set_function("SET_VEHICLE_TIMED_EXPLOSION", LUA_NATIVE_VEHICLE_SET_VEHICLE_TIMED_EXPLOSION); @@ -4431,12 +4563,17 @@ namespace lua::native VEHICLE.set_function("GET_LANDING_GEAR_STATE", LUA_NATIVE_VEHICLE_GET_LANDING_GEAR_STATE); VEHICLE.set_function("IS_ANY_VEHICLE_NEAR_POINT", LUA_NATIVE_VEHICLE_IS_ANY_VEHICLE_NEAR_POINT); VEHICLE.set_function("REQUEST_VEHICLE_HIGH_DETAIL_MODEL", LUA_NATIVE_VEHICLE_REQUEST_VEHICLE_HIGH_DETAIL_MODEL); + VEHICLE.set_function("GET_VEHICLE_MODEL_NUM_DRIVE_GEARS_", LUA_NATIVE_VEHICLE_GET_VEHICLE_MODEL_NUM_DRIVE_GEARS_); + VEHICLE.set_function("GET_VEHICLE_MAX_DRIVE_GEAR_COUNT_", LUA_NATIVE_VEHICLE_GET_VEHICLE_MAX_DRIVE_GEAR_COUNT_); + VEHICLE.set_function("GET_VEHICLE_CURRENT_DRIVE_GEAR_", LUA_NATIVE_VEHICLE_GET_VEHICLE_CURRENT_DRIVE_GEAR_); + VEHICLE.set_function("GET_VEHICLE_CURRENT_REV_RATIO_", LUA_NATIVE_VEHICLE_GET_VEHICLE_CURRENT_REV_RATIO_); VEHICLE.set_function("REMOVE_VEHICLE_HIGH_DETAIL_MODEL", LUA_NATIVE_VEHICLE_REMOVE_VEHICLE_HIGH_DETAIL_MODEL); VEHICLE.set_function("IS_VEHICLE_HIGH_DETAIL", LUA_NATIVE_VEHICLE_IS_VEHICLE_HIGH_DETAIL); VEHICLE.set_function("REQUEST_VEHICLE_ASSET", LUA_NATIVE_VEHICLE_REQUEST_VEHICLE_ASSET); VEHICLE.set_function("HAS_VEHICLE_ASSET_LOADED", LUA_NATIVE_VEHICLE_HAS_VEHICLE_ASSET_LOADED); VEHICLE.set_function("REMOVE_VEHICLE_ASSET", LUA_NATIVE_VEHICLE_REMOVE_VEHICLE_ASSET); VEHICLE.set_function("SET_VEHICLE_TOW_TRUCK_ARM_POSITION", LUA_NATIVE_VEHICLE_SET_VEHICLE_TOW_TRUCK_ARM_POSITION); + VEHICLE.set_function("SET_ATTACHED_VEHICLE_TO_TOW_TRUCK_ARM_", LUA_NATIVE_VEHICLE_SET_ATTACHED_VEHICLE_TO_TOW_TRUCK_ARM_); VEHICLE.set_function("ATTACH_VEHICLE_TO_TOW_TRUCK", LUA_NATIVE_VEHICLE_ATTACH_VEHICLE_TO_TOW_TRUCK); VEHICLE.set_function("DETACH_VEHICLE_FROM_TOW_TRUCK", LUA_NATIVE_VEHICLE_DETACH_VEHICLE_FROM_TOW_TRUCK); VEHICLE.set_function("DETACH_VEHICLE_FROM_ANY_TOW_TRUCK", LUA_NATIVE_VEHICLE_DETACH_VEHICLE_FROM_ANY_TOW_TRUCK); @@ -4539,6 +4676,8 @@ namespace lua::native VEHICLE.set_function("GET_VEHICLE_COLOURS_WHICH_CAN_BE_SET", LUA_NATIVE_VEHICLE_GET_VEHICLE_COLOURS_WHICH_CAN_BE_SET); VEHICLE.set_function("GET_VEHICLE_CAUSE_OF_DESTRUCTION", LUA_NATIVE_VEHICLE_GET_VEHICLE_CAUSE_OF_DESTRUCTION); VEHICLE.set_function("OVERRIDE_PLANE_DAMAGE_THREHSOLD", LUA_NATIVE_VEHICLE_OVERRIDE_PLANE_DAMAGE_THREHSOLD); + VEHICLE.set_function("SET_TRANSMISSION_REDUCED_GEAR_RATIO_", LUA_NATIVE_VEHICLE_SET_TRANSMISSION_REDUCED_GEAR_RATIO_); + VEHICLE.set_function("GET_VEHICLE_DESIRED_DRIVE_GEAR_", LUA_NATIVE_VEHICLE_GET_VEHICLE_DESIRED_DRIVE_GEAR_); VEHICLE.set_function("GET_IS_LEFT_VEHICLE_HEADLIGHT_DAMAGED", LUA_NATIVE_VEHICLE_GET_IS_LEFT_VEHICLE_HEADLIGHT_DAMAGED); VEHICLE.set_function("GET_IS_RIGHT_VEHICLE_HEADLIGHT_DAMAGED", LUA_NATIVE_VEHICLE_GET_IS_RIGHT_VEHICLE_HEADLIGHT_DAMAGED); VEHICLE.set_function("GET_BOTH_VEHICLE_HEADLIGHTS_DAMAGED", LUA_NATIVE_VEHICLE_GET_BOTH_VEHICLE_HEADLIGHTS_DAMAGED); @@ -4741,6 +4880,7 @@ namespace lua::native VEHICLE.set_function("VEHICLE_SET_JET_WASH_FORCE_ENABLED", LUA_NATIVE_VEHICLE_VEHICLE_SET_JET_WASH_FORCE_ENABLED); VEHICLE.set_function("SET_VEHICLE_WEAPON_CAN_TARGET_OBJECTS", LUA_NATIVE_VEHICLE_SET_VEHICLE_WEAPON_CAN_TARGET_OBJECTS); VEHICLE.set_function("SET_VEHICLE_USE_BOOST_BUTTON_FOR_WHEEL_RETRACT", LUA_NATIVE_VEHICLE_SET_VEHICLE_USE_BOOST_BUTTON_FOR_WHEEL_RETRACT); + VEHICLE.set_function("SET_VEHICLE_USE_HORN_BUTTON_FOR_NITROUS_", LUA_NATIVE_VEHICLE_SET_VEHICLE_USE_HORN_BUTTON_FOR_NITROUS_); VEHICLE.set_function("VEHICLE_SET_PARACHUTE_MODEL_OVERRIDE", LUA_NATIVE_VEHICLE_VEHICLE_SET_PARACHUTE_MODEL_OVERRIDE); VEHICLE.set_function("VEHICLE_SET_PARACHUTE_MODEL_TINT_INDEX", LUA_NATIVE_VEHICLE_VEHICLE_SET_PARACHUTE_MODEL_TINT_INDEX); VEHICLE.set_function("VEHICLE_SET_OVERRIDE_EXTENABLE_SIDE_RATIO", LUA_NATIVE_VEHICLE_VEHICLE_SET_OVERRIDE_EXTENABLE_SIDE_RATIO); @@ -4795,11 +4935,20 @@ namespace lua::native VEHICLE.set_function("GET_LAST_SHUNT_VEHICLE", LUA_NATIVE_VEHICLE_GET_LAST_SHUNT_VEHICLE); VEHICLE.set_function("SET_DISABLE_VEHICLE_EXPLOSIONS_DAMAGE", LUA_NATIVE_VEHICLE_SET_DISABLE_VEHICLE_EXPLOSIONS_DAMAGE); VEHICLE.set_function("SET_OVERRIDE_NITROUS_LEVEL", LUA_NATIVE_VEHICLE_SET_OVERRIDE_NITROUS_LEVEL); + VEHICLE.set_function("SET_NITROUS_IS_ACTIVE", LUA_NATIVE_VEHICLE_SET_NITROUS_IS_ACTIVE); + VEHICLE.set_function("SET_OVERRIDE_TRACTION_LOSS_MULTIPLIER_", LUA_NATIVE_VEHICLE_SET_OVERRIDE_TRACTION_LOSS_MULTIPLIER_); + VEHICLE.set_function("SET_DRIFT_SLIP_ANGLE_LIMITS_", LUA_NATIVE_VEHICLE_SET_DRIFT_SLIP_ANGLE_LIMITS_); + VEHICLE.set_function("SET_MINIMUM_TIME_BETWEEN_GEAR_SHIFTS_", LUA_NATIVE_VEHICLE_SET_MINIMUM_TIME_BETWEEN_GEAR_SHIFTS_); + VEHICLE.set_function("FULLY_CHARGE_NITROUS", LUA_NATIVE_VEHICLE_FULLY_CHARGE_NITROUS); + VEHICLE.set_function("GET_REMAINING_NITROUS_DURATION_", LUA_NATIVE_VEHICLE_GET_REMAINING_NITROUS_DURATION_); + VEHICLE.set_function("IS_NITROUS_ACTIVE", LUA_NATIVE_VEHICLE_IS_NITROUS_ACTIVE); + VEHICLE.set_function("CLEAR_NITROUS", LUA_NATIVE_VEHICLE_CLEAR_NITROUS); VEHICLE.set_function("SET_INCREASE_WHEEL_CRUSH_DAMAGE", LUA_NATIVE_VEHICLE_SET_INCREASE_WHEEL_CRUSH_DAMAGE); VEHICLE.set_function("SET_DISABLE_WEAPON_BLADE_FORCES", LUA_NATIVE_VEHICLE_SET_DISABLE_WEAPON_BLADE_FORCES); VEHICLE.set_function("SET_USE_DOUBLE_CLICK_FOR_CAR_JUMP", LUA_NATIVE_VEHICLE_SET_USE_DOUBLE_CLICK_FOR_CAR_JUMP); VEHICLE.set_function("GET_DOES_VEHICLE_HAVE_TOMBSTONE", LUA_NATIVE_VEHICLE_GET_DOES_VEHICLE_HAVE_TOMBSTONE); VEHICLE.set_function("HIDE_TOMBSTONE", LUA_NATIVE_VEHICLE_HIDE_TOMBSTONE); + VEHICLE.set_function("APPLY_EMP_EFFECT", LUA_NATIVE_VEHICLE_APPLY_EMP_EFFECT); VEHICLE.set_function("GET_IS_VEHICLE_DISABLED_BY_EMP", LUA_NATIVE_VEHICLE_GET_IS_VEHICLE_DISABLED_BY_EMP); VEHICLE.set_function("SET_DISABLE_RETRACTING_WEAPON_BLADES", LUA_NATIVE_VEHICLE_SET_DISABLE_RETRACTING_WEAPON_BLADES); VEHICLE.set_function("GET_TYRE_HEALTH", LUA_NATIVE_VEHICLE_GET_TYRE_HEALTH); @@ -4814,5 +4963,9 @@ namespace lua::native VEHICLE.set_function("GET_DRIFT_TYRES_SET", LUA_NATIVE_VEHICLE_GET_DRIFT_TYRES_SET); VEHICLE.set_function("NETWORK_USE_HIGH_PRECISION_TRAIN_BLENDING", LUA_NATIVE_VEHICLE_NETWORK_USE_HIGH_PRECISION_TRAIN_BLENDING); VEHICLE.set_function("SET_CHECK_FOR_ENOUGH_ROOM_FOR_PED", LUA_NATIVE_VEHICLE_SET_CHECK_FOR_ENOUGH_ROOM_FOR_PED); + VEHICLE.set_function("SET_ALLOW_COLLISION_WHEN_IN_VEHICLE_", LUA_NATIVE_VEHICLE_SET_ALLOW_COLLISION_WHEN_IN_VEHICLE_); + VEHICLE.set_function("IS_VEHICLE_GEN9_EXCLUSIVE_MODEL_", LUA_NATIVE_VEHICLE_IS_VEHICLE_GEN9_EXCLUSIVE_MODEL_); + VEHICLE.set_function("GET_VEHICLE_MAX_EXHAUST_BONE_COUNT_", LUA_NATIVE_VEHICLE_GET_VEHICLE_MAX_EXHAUST_BONE_COUNT_); + VEHICLE.set_function("GET_VEHICLE_EXHAUST_BONE_", LUA_NATIVE_VEHICLE_GET_VEHICLE_EXHAUST_BONE_); } } diff --git a/src/lua/natives/lua_native_binding_WEAPON.cpp b/src/lua/natives/lua_native_binding_WEAPON.cpp index 25e2bd31..10fa00db 100644 --- a/src/lua/natives/lua_native_binding_WEAPON.cpp +++ b/src/lua/natives/lua_native_binding_WEAPON.cpp @@ -556,6 +556,11 @@ namespace lua::native WEAPON::REQUEST_WEAPON_HIGH_DETAIL_MODEL(weaponObject); } + static void LUA_NATIVE_WEAPON_SET_WEAPON_PED_DAMAGE_MODIFIER_(Hash weapon, float damageModifier) + { + WEAPON::_SET_WEAPON_PED_DAMAGE_MODIFIER(weapon, damageModifier); + } + static void LUA_NATIVE_WEAPON_SET_WEAPON_DAMAGE_MODIFIER(Hash weaponHash, float damageMultiplier) { WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weaponHash, damageMultiplier); @@ -772,6 +777,7 @@ namespace lua::native WEAPON.set_function("SET_PED_CHANCE_OF_FIRING_BLANKS", LUA_NATIVE_WEAPON_SET_PED_CHANCE_OF_FIRING_BLANKS); WEAPON.set_function("SET_PED_SHOOT_ORDNANCE_WEAPON", LUA_NATIVE_WEAPON_SET_PED_SHOOT_ORDNANCE_WEAPON); WEAPON.set_function("REQUEST_WEAPON_HIGH_DETAIL_MODEL", LUA_NATIVE_WEAPON_REQUEST_WEAPON_HIGH_DETAIL_MODEL); + WEAPON.set_function("SET_WEAPON_PED_DAMAGE_MODIFIER_", LUA_NATIVE_WEAPON_SET_WEAPON_PED_DAMAGE_MODIFIER_); WEAPON.set_function("SET_WEAPON_DAMAGE_MODIFIER", LUA_NATIVE_WEAPON_SET_WEAPON_DAMAGE_MODIFIER); WEAPON.set_function("SET_WEAPON_AOE_MODIFIER", LUA_NATIVE_WEAPON_SET_WEAPON_AOE_MODIFIER); WEAPON.set_function("SET_WEAPON_EFFECT_DURATION_MODIFIER", LUA_NATIVE_WEAPON_SET_WEAPON_EFFECT_DURATION_MODIFIER); diff --git a/src/lua/natives/lua_native_binding_ZONE.cpp b/src/lua/natives/lua_native_binding_ZONE.cpp index 1c9e825b..7b0ec675 100644 --- a/src/lua/natives/lua_native_binding_ZONE.cpp +++ b/src/lua/natives/lua_native_binding_ZONE.cpp @@ -9,9 +9,9 @@ namespace lua::native return retval; } - static int LUA_NATIVE_ZONE_GET_ZONE_FROM_NAME_ID(const char* zoneName) + static int LUA_NATIVE_ZONE_GET_ZONE_FROM_NAME_ID(sol::stack_object zoneName) { - auto retval = ZONE::GET_ZONE_FROM_NAME_ID(zoneName); + auto retval = ZONE::GET_ZONE_FROM_NAME_ID(zoneName.is() ? zoneName.as() : nullptr); return retval; }