Update crossmap and natives.hpp to 3095. (#2565)

This commit is contained in:
Aure7138
2023-12-15 23:01:57 +08:00
committed by GitHub
parent f3faa8540f
commit 8b62dadcd5
21 changed files with 195 additions and 90 deletions

View File

@ -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)
static void LUA_NATIVE_ENTITY_SET_ENTITY_HEALTH(Entity entity, int health, int p2, int p3)
{
ENTITY::SET_ENTITY_HEALTH(entity, health, p2);
ENTITY::SET_ENTITY_HEALTH(entity, health, p2, p3);
}
static void LUA_NATIVE_ENTITY_SET_ENTITY_INVINCIBLE(Entity entity, bool toggle)

View File

@ -3073,9 +3073,9 @@ namespace lua::native
NETWORK::SET_NETWORK_ID_VISIBLE_IN_CUTSCENE_HACK(netId, p1, p2);
}
static void LUA_NATIVE_NETWORK_SET_NETWORK_ID_VISIBLE_IN_CUTSCENE_REMAIN_HACK(Any p0, Any p1)
static void LUA_NATIVE_NETWORK_SET_NETWORK_ID_VISIBLE_IN_CUTSCENE_REMAIN_HACK(Any p0, Any p1, Any p2)
{
NETWORK::SET_NETWORK_ID_VISIBLE_IN_CUTSCENE_REMAIN_HACK(p0, p1);
NETWORK::SET_NETWORK_ID_VISIBLE_IN_CUTSCENE_REMAIN_HACK(p0, p1, p2);
}
static void LUA_NATIVE_NETWORK_SET_NETWORK_CUTSCENE_ENTITIES(bool toggle)

View File

@ -45,9 +45,9 @@ namespace lua::native
return retval;
}
static void LUA_NATIVE_OBJECT_SET_OBJECT_TARGETTABLE(Object object, bool targettable)
static void LUA_NATIVE_OBJECT_SET_OBJECT_TARGETTABLE(Object object, bool targettable, Any p2)
{
OBJECT::SET_OBJECT_TARGETTABLE(object, targettable);
OBJECT::SET_OBJECT_TARGETTABLE(object, targettable, p2);
}
static void LUA_NATIVE_OBJECT_SET_OBJECT_FORCE_VEHICLES_TO_AVOID(Object object, bool toggle)

View File

@ -1120,9 +1120,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)
static void LUA_NATIVE_PED_APPLY_DAMAGE_TO_PED(Ped ped, int damageAmount, bool p2, Any p3, int p4)
{
PED::APPLY_DAMAGE_TO_PED(ped, damageAmount, p2, p3);
PED::APPLY_DAMAGE_TO_PED(ped, damageAmount, p2, p3, p4);
}
static int LUA_NATIVE_PED_GET_TIME_PED_DAMAGED_BY_WEAPON(Ped ped, Hash weaponHash)
@ -2208,9 +2208,9 @@ namespace lua::native
PED::GIVE_PED_NM_MESSAGE(ped);
}
static int LUA_NATIVE_PED_ADD_SCENARIO_BLOCKING_AREA(float x1, float y1, float z1, float x2, float y2, float z2, bool p6, bool p7, bool p8, bool p9)
static int LUA_NATIVE_PED_ADD_SCENARIO_BLOCKING_AREA(float x1, float y1, float z1, float x2, float y2, float z2, bool p6, bool p7, bool p8, bool p9, Any p10)
{
auto retval = PED::ADD_SCENARIO_BLOCKING_AREA(x1, y1, z1, x2, y2, z2, p6, p7, p8, p9);
auto retval = PED::ADD_SCENARIO_BLOCKING_AREA(x1, y1, z1, x2, y2, z2, p6, p7, p8, p9, p10);
return retval;
}

View File

@ -207,9 +207,9 @@ namespace lua::native
return retval;
}
static Any LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT(int eventGroup, Any eventData, int eventDataSize, int playerBits)
static Any LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT_NEW_(int eventGroup, Any eventData, int eventDataSize, int playerBits, int eventType)
{
SCRIPT::SEND_TU_SCRIPT_EVENT(eventGroup, &eventData, eventDataSize, playerBits);
SCRIPT::_SEND_TU_SCRIPT_EVENT_NEW(eventGroup, &eventData, eventDataSize, playerBits, eventType);
return eventData;
}
@ -252,6 +252,6 @@ namespace lua::native
SCRIPT.set_function("BG_DOES_LAUNCH_PARAM_EXIST", LUA_NATIVE_SCRIPT_BG_DOES_LAUNCH_PARAM_EXIST);
SCRIPT.set_function("BG_GET_LAUNCH_PARAM_VALUE", LUA_NATIVE_SCRIPT_BG_GET_LAUNCH_PARAM_VALUE);
SCRIPT.set_function("BG_GET_SCRIPT_ID_FROM_NAME_HASH", LUA_NATIVE_SCRIPT_BG_GET_SCRIPT_ID_FROM_NAME_HASH);
SCRIPT.set_function("SEND_TU_SCRIPT_EVENT", LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT);
SCRIPT.set_function("SEND_TU_SCRIPT_EVENT_NEW_", LUA_NATIVE_SCRIPT_SEND_TU_SCRIPT_EVENT_NEW_);
}
}

View File

@ -84,15 +84,6 @@ namespace lua::native
return return_values;
}
static std::tuple<bool, Any> LUA_NATIVE_SOCIALCLUB_SC_INBOX_SEND_BOUNTY_TO_RECIP_LIST(Any data)
{
std::tuple<bool, Any> return_values;
std::get<0>(return_values) = (bool)SOCIALCLUB::SC_INBOX_SEND_BOUNTY_TO_RECIP_LIST(&data);
std::get<1>(return_values) = data;
return return_values;
}
static std::tuple<bool, Any> LUA_NATIVE_SOCIALCLUB_SC_INBOX_GET_BOUNTY_DATA_AT_INDEX(int index, Any outData)
{
std::tuple<bool, Any> return_values;
@ -601,7 +592,6 @@ namespace lua::native
SOCIALCLUB.set_function("SC_INBOX_MESSAGE_PUSH_GAMER_T0_RECIP_LIST", LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_PUSH_GAMER_T0_RECIP_LIST);
SOCIALCLUB.set_function("SC_INBOX_SEND_UGCSTATUPDATE_TO_RECIP_LIST", LUA_NATIVE_SOCIALCLUB_SC_INBOX_SEND_UGCSTATUPDATE_TO_RECIP_LIST);
SOCIALCLUB.set_function("SC_INBOX_MESSAGE_GET_UGCDATA", LUA_NATIVE_SOCIALCLUB_SC_INBOX_MESSAGE_GET_UGCDATA);
SOCIALCLUB.set_function("SC_INBOX_SEND_BOUNTY_TO_RECIP_LIST", LUA_NATIVE_SOCIALCLUB_SC_INBOX_SEND_BOUNTY_TO_RECIP_LIST);
SOCIALCLUB.set_function("SC_INBOX_GET_BOUNTY_DATA_AT_INDEX", LUA_NATIVE_SOCIALCLUB_SC_INBOX_GET_BOUNTY_DATA_AT_INDEX);
SOCIALCLUB.set_function("SC_EMAIL_RETRIEVE_EMAILS", LUA_NATIVE_SOCIALCLUB_SC_EMAIL_RETRIEVE_EMAILS);
SOCIALCLUB.set_function("SC_EMAIL_GET_RETRIEVAL_STATUS", LUA_NATIVE_SOCIALCLUB_SC_EMAIL_GET_RETRIEVAL_STATUS);

View File

@ -402,9 +402,9 @@ namespace lua::native
STATS::PLAYSTATS_STARTED_SESSION_IN_OFFLINEMODE();
}
static void LUA_NATIVE_STATS_PLAYSTATS_ACTIVITY_DONE(int p0, int activityId)
static void LUA_NATIVE_STATS_PLAYSTATS_ACTIVITY_DONE(int p0, int activityId, int unkHash)
{
STATS::PLAYSTATS_ACTIVITY_DONE(p0, activityId);
STATS::PLAYSTATS_ACTIVITY_DONE(p0, activityId, unkHash);
}
static void LUA_NATIVE_STATS_PLAYSTATS_LEAVE_JOB_CHAIN(Any p0, Any p1, Any p2, Any p3, Any p4)
@ -611,9 +611,9 @@ namespace lua::native
STATS::PLAYSTATS_PEGASUS_AS_PERSONAL_AIRCRAFT(modelHash);
}
static void LUA_NATIVE_STATS_PLAYSTATS_SHOPMENU_NAV_(Any p0, Any p1, Any p2)
static void LUA_NATIVE_STATS_PLAYSTATS_SHOPMENU_NAV_(Any p0, Any p1, Any p2, Any p3)
{
STATS::_PLAYSTATS_SHOPMENU_NAV(p0, p1, p2);
STATS::_PLAYSTATS_SHOPMENU_NAV(p0, p1, p2, p3);
}
static void LUA_NATIVE_STATS_PLAYSTATS_FM_EVENT_CHALLENGES(Any p0)
@ -755,18 +755,6 @@ namespace lua::native
return return_values;
}
static std::tuple<bool, Any, Any, Any, Any> LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_ROW(Any p0, Any p1, Any p2, Any p3, Any p4, Any p5, Any p6)
{
std::tuple<bool, Any, Any, Any, Any> return_values;
std::get<0>(return_values) = (bool)STATS::LEADERBOARDS2_READ_BY_ROW(&p0, &p1, p2, &p3, p4, &p5, p6);
std::get<1>(return_values) = p0;
std::get<2>(return_values) = p1;
std::get<3>(return_values) = p3;
std::get<4>(return_values) = p5;
return return_values;
}
static std::tuple<bool, Any> LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_RANK(Any p0, Any p1, Any p2)
{
std::tuple<bool, Any> return_values;
@ -1353,9 +1341,9 @@ namespace lua::native
STATS::PLAYSTATS_HIT_CONTRABAND_DESTROY_LIMIT(p0);
}
static void LUA_NATIVE_STATS_START_BEING_BOSS(Any p0, Any p1)
static void LUA_NATIVE_STATS_START_BEING_BOSS(Any p0, Any p1, Any p2)
{
STATS::START_BEING_BOSS(p0, p1);
STATS::START_BEING_BOSS(p0, p1, p2);
}
static void LUA_NATIVE_STATS_START_BEING_GOON(Any p0, Any p1, Any p2)
@ -1734,9 +1722,9 @@ namespace lua::native
STATS::PLAYSTATS_KILL_YOURSELF();
}
static void LUA_NATIVE_STATS_PLAYSTATS_FM_MISSION_END(Any p0, Any p1, Any p2)
static void LUA_NATIVE_STATS_PLAYSTATS_FM_MISSION_END(Any p0, Any p1, Any p2, Any p3)
{
STATS::PLAYSTATS_FM_MISSION_END(p0, p1, p2);
STATS::PLAYSTATS_FM_MISSION_END(p0, p1, p2, p3);
}
static void LUA_NATIVE_STATS_PLAYSTATS_HEIST4_PREP(Any p0)
@ -1998,7 +1986,6 @@ namespace lua::native
STATS.set_function("LEADERBOARDS_READ_SUCCESSFUL", LUA_NATIVE_STATS_LEADERBOARDS_READ_SUCCESSFUL);
STATS.set_function("LEADERBOARDS2_READ_FRIENDS_BY_ROW", LUA_NATIVE_STATS_LEADERBOARDS2_READ_FRIENDS_BY_ROW);
STATS.set_function("LEADERBOARDS2_READ_BY_HANDLE", LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_HANDLE);
STATS.set_function("LEADERBOARDS2_READ_BY_ROW", LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_ROW);
STATS.set_function("LEADERBOARDS2_READ_BY_RANK", LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_RANK);
STATS.set_function("LEADERBOARDS2_READ_BY_RADIUS", LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_RADIUS);
STATS.set_function("LEADERBOARDS2_READ_BY_SCORE_INT", LUA_NATIVE_STATS_LEADERBOARDS2_READ_BY_SCORE_INT);

View File

@ -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)
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)
{
TASK::TASK_ENTER_VEHICLE(ped, vehicle, timeout, seat, speed, flag, overrideEntryClipsetName);
TASK::TASK_ENTER_VEHICLE(ped, vehicle, timeout, seat, speed, flag, overrideEntryClipsetName, network_is_activity_session);
}
static void LUA_NATIVE_TASK_TASK_LEAVE_VEHICLE(Ped ped, Vehicle vehicle, int flags)
@ -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)
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)
{
TASK::TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(ped, x1, y1, z1, x2, y2, z2, minZ, ropeHandle, clipSet, p10);
TASK::TASK_RAPPEL_DOWN_WALL_USING_CLIPSET_OVERRIDE(ped, x1, y1, z1, x2, y2, z2, minZ, ropeHandle, clipSet, p10, p11);
}
static int LUA_NATIVE_TASK_GET_TASK_RAPPEL_DOWN_WALL_STATE(Ped ped)