ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

feat(Natives): Updated natives to new names (#450)

Browse Source
This commit is contained in:
Yimura 2022-09-20 14:03:19 +01:00 committed by GitHub
parent 8907801e8e
commit 42ccbd4792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 2375 additions and 2317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BigBaseV2/src/backend/looped/vehicle/auto_drive.cpp
View File

@ -85,7 +85,7 @@ namespace big
(to_waypoint && !does_waypoint_exist) ||
interupted
) {
TASK::CLEAR_VEHICLE_TASKS_(self::veh);
TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh);
TASK::CLEAR_PED_TASKS(self::ped);
if (!interupted && started)
@ -110,7 +110,7 @@ namespace big
{
changing_driving_styles = false;
TASK::CLEAR_VEHICLE_TASKS_(self::veh);
TASK::CLEAR_PRIMARY_VEHICLE_TASK(self::veh);
TASK::CLEAR_PED_TASKS(self::ped);
if (to_waypoint)

2
BigBaseV2/src/backend/looped/vehicle/boost_behavior.cpp
View File

@ -8,7 +8,7 @@ namespace big
{
auto* const vehicle = g_local_player->m_vehicle;
if (vehicle && VEHICLE::GET_HAS_ROCKET_BOOST_(self::veh))
if (vehicle && VEHICLE::GET_HAS_ROCKET_BOOST(self::veh))
{
if (g->vehicle.boost_behavior == eBoostBehaviors::INSTANT_REFIL && vehicle->m_boost == 0.f) // No Boost Refil Time
{

10
BigBaseV2/src/backend/looped/vehicle/rgb_paint.cpp
View File

@ -107,11 +107,11 @@ namespace big
VEHICLE::SET_VEHICLE_CUSTOM_SECONDARY_COLOUR(vehicle, red, green, blue);
}
if (g->vehicle.rainbow_paint.neon) {
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, 0, 1);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, 1, 1);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, 2, 1);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, 3, 1);
VEHICLE::SET_VEHICLE_NEON_LIGHTS_COLOUR_(vehicle, red, green, blue);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, 0, 1);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, 1, 1);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, 2, 1);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, 3, 1);
VEHICLE::SET_VEHICLE_NEON_COLOUR(vehicle, red, green, blue);
}
if (g->vehicle.rainbow_paint.smoke) {
VEHICLE::SET_VEHICLE_TYRE_SMOKE_COLOR(vehicle, red, green, blue);

2
BigBaseV2/src/backend/looped/weapons/increase_damage.cpp
View File

@ -8,7 +8,7 @@ namespace big
if (g->weapons.increased_damage != 1) {
Hash weapon{};
WEAPON::GET_CURRENT_PED_WEAPON(self::ped, &weapon, 0);
WEAPON::SET_WEAPON_DAMAGE_MODIFIER_THIS_FRAME_(weapon, g->weapons.increased_damage);
WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, g->weapons.increased_damage);
}
}
}

26
BigBaseV2/src/gta/vector.hpp
View File

@ -62,3 +62,29 @@ namespace rage
};
#pragma pack(pop)
}
class Vector2 final
{
public:
Vector2() = default;
Vector2(float x, float y)
: x(x), y(y)
{}
public:
float x, y;
};
class Vector4 final
{
public:
Vector4() = default;
Vector4(float x, float y, float z, float w)
: x(x), y(y), z(z), w(w)
{}
public:
float x, y, z, w;
};

4420
BigBaseV2/src/natives.hpp
View File

File diff suppressed because it is too large Load Diff

2
BigBaseV2/src/services/mobile/mobile_service.cpp
View File

@ -15,7 +15,7 @@ namespace big
m_name = fmt::format(
"{} ({})",
HUD::GET_LABEL_TEXT_(VEHICLE::GET_DISPLAY_NAME_FROM_VEHICLE_MODEL(m_hash)),
HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(VEHICLE::GET_DISPLAY_NAME_FROM_VEHICLE_MODEL(m_hash)),
m_plate
);
}

26
BigBaseV2/src/services/vehicle/persist_car_service.cpp
View File

@ -97,7 +97,7 @@ namespace big
for (const auto& j : model_attachments)
{
const auto attachment = j.get<model_attachment>();
const auto object = big::world_model::spawn(attachment.model_hash);
const auto object = world_model::spawn(attachment.model_hash);
if (object)
{
ENTITY::ATTACH_ENTITY_TO_ENTITY(
@ -105,7 +105,7 @@ namespace big
0,
attachment.position.x, attachment.position.y, attachment.position.z,
attachment.rotation.x, attachment.rotation.y, attachment.rotation.z,
false, false, false, false, 0, true);
false, false, false, false, 0, true, 0);
}
}
@ -119,7 +119,7 @@ namespace big
0,
attachment.position.x, attachment.position.y, attachment.position.z,
attachment.rotation.x, attachment.rotation.y, attachment.rotation.z,
false, false, false, false, 0, true);
false, false, false, false, 0, true, 0);
VEHICLE::SET_VEHICLE_IS_CONSIDERED_BY_PLAYER(vehicle_to_attach, false);
}
@ -200,9 +200,9 @@ namespace big
}
std::vector<bool> neon_lights = vehicle_json[neon_lights_key];
for (int i = NEON_LEFT; i <= NEON_BACK; i++)
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, i, neon_lights[i]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, i, neon_lights[i]);
std::vector<int> neon_color = vehicle_json[neon_color_key];
VEHICLE::SET_VEHICLE_NEON_LIGHTS_COLOUR_(vehicle, neon_color[0], neon_color[1], neon_color[2]);
VEHICLE::SET_VEHICLE_NEON_COLOUR(vehicle, neon_color[0], neon_color[1], neon_color[2]);
if (VEHICLE::IS_VEHICLE_A_CONVERTIBLE(vehicle, 0))
{
@ -213,15 +213,15 @@ namespace big
VEHICLE::LOWER_CONVERTIBLE_ROOF(vehicle, true);
}
VEHICLE::SET_VEHICLE_INTERIOR_COLOR_(vehicle, vehicle_json[interior_color_key]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_5(vehicle, vehicle_json[interior_color_key]);
VEHICLE::SET_VEHICLE_DASHBOARD_COLOR_(vehicle, vehicle_json[dash_color_key]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_6(vehicle, vehicle_json[dash_color_key]);
const BOOL have_clan_logo = vehicle_json[clan_logo_key];
if (have_clan_logo)
vehicle_helper::add_clan_logo_to_vehicle(vehicle, ped);
VEHICLE::SET_VEHICLE_XENON_LIGHTS_COLOR_(vehicle, vehicle_json[headlight_color_key]);
VEHICLE::SET_VEHICLE_XENON_LIGHT_COLOR_INDEX(vehicle, vehicle_json[headlight_color_key]);
}
return vehicle;
@ -436,10 +436,10 @@ namespace big
bool neon_lights[4]{};
for (int i = NEON_LEFT; i <= NEON_BACK; i++)
neon_lights[i] = VEHICLE::IS_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, i);
neon_lights[i] = VEHICLE::GET_VEHICLE_NEON_ENABLED(vehicle, i);
int neon_color[3]{};
VEHICLE::GET_VEHICLE_NEON_LIGHTS_COLOUR_(vehicle, &neon_color[0], &neon_color[1], &neon_color[2]);
VEHICLE::GET_VEHICLE_NEON_COLOUR(vehicle, &neon_color[0], &neon_color[1], &neon_color[2]);
vehicle_json[neon_color_key] = neon_color;
vehicle_json[neon_lights_key] = neon_lights;
@ -447,13 +447,13 @@ namespace big
vehicle_json[convertable_state_key] = VEHICLE::GET_CONVERTIBLE_ROOF_STATE(vehicle);
int interior_color, dashboard_color;
VEHICLE::GET_VEHICLE_INTERIOR_COLOR_(vehicle, &interior_color);
VEHICLE::GET_VEHICLE_DASHBOARD_COLOR_(vehicle, &dashboard_color);
VEHICLE::GET_VEHICLE_EXTRA_COLOUR_5(vehicle, &interior_color);
VEHICLE::GET_VEHICLE_EXTRA_COLOUR_6(vehicle, &dashboard_color);
vehicle_json[interior_color_key] = interior_color;
vehicle_json[dash_color_key] = dashboard_color;
vehicle_json[clan_logo_key] = GRAPHICS::DOES_VEHICLE_HAVE_CREW_EMBLEM(vehicle, 0);
vehicle_json[headlight_color_key] = VEHICLE::GET_VEHICLE_XENON_LIGHTS_COLOR_(vehicle);
vehicle_json[headlight_color_key] = VEHICLE::GET_VEHICLE_XENON_LIGHT_COLOR_INDEX(vehicle);
}
return vehicle_json;

126
BigBaseV2/src/services/vehicle_helper/vehicle_helper.cpp
View File

@ -27,114 +27,114 @@ namespace big
switch (mod_slot)
{
case MOD_HOOD:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_HOD");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_HOD");
case MOD_ARMOR:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_ARM");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_ARM");
case MOD_BRAKES:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_BRA");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_BRA");
case MOD_ENGINE:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_ENG");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_ENG");
case MOD_SUSPENSION:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_SUS");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_SUS");
case MOD_TRANSMISSION:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_TRN");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_TRN");
case MOD_HORNS:
return HUD::GET_LABEL_TEXT_("CMOD_MOD_HRN");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_HRN");
case MOD_FRONTWHEEL:
if (!VEHICLE::IS_THIS_MODEL_A_BIKE(model) && VEHICLE::IS_THIS_MODEL_A_BICYCLE(model))
return HUD::GET_LABEL_TEXT_("CMOD_MOD_WHEM");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_MOD_WHEM");
else
return HUD::GET_LABEL_TEXT_("CMOD_WHE0_0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_WHE0_0");
case MOD_REARWHEEL:
return HUD::GET_LABEL_TEXT_("CMOD_WHE0_1");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_WHE0_1");
//Bennys
case MOD_PLATEHOLDER:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S0");
case MOD_VANITYPLATES:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S1");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S1");
case MOD_TRIMDESIGN:
if (model == VEHICLE_SULTANRS)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S2b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S2b");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S2");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S2");
case MOD_ORNAMENTS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S3");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S3");
case MOD_DASHBOARD:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S4");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S4");
case MOD_DIALDESIGN:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S5");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S5");
case MOD_DOORSPEAKERS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S6");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S6");
case MOD_SEATS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S7");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S7");
case MOD_STEERINGWHEELS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S8");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S8");
case MOD_COLUMNSHIFTERLEVERS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S9");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S9");
case MOD_PLAQUES:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S10");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S10");
case MOD_SPEAKERS:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S11");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S11");
case MOD_TRUNK:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S12");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S12");
case MOD_HYDRO:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S13");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S13");
case MOD_ENGINEBLOCK:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S14");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S14");
case MOD_AIRFILTER:
if (model == VEHICLE_SULTANRS)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S15b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S15b");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S15");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S15");
case MOD_STRUTS:
if (model == VEHICLE_SULTANRS || model == VEHICLE_BANSHEE2)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S16b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S16b");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S16");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S16");
case MOD_ARCHCOVER:
if (model == VEHICLE_SULTANRS)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S17b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S17b");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S17");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S17");
case MOD_AERIALS:
if (model == VEHICLE_SULTANRS)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S18b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S18b");
else if (model == VEHICLE_BTYPE3)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S18c");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S18c");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S18");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S18");
case MOD_TRIM:
if (model == VEHICLE_SULTANRS)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S19b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S19b");
else if (model == VEHICLE_BTYPE3)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S19c");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S19c");
else if (model == VEHICLE_VIRGO2)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S19d");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S19d");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S19");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S19");
case MOD_TANK:
if (model == VEHICLE_SLAMVAN3)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S27");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S27");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S20");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S20");
case MOD_WINDOWS:
if (model == VEHICLE_BTYPE3)
return HUD::GET_LABEL_TEXT_("CMM_MOD_S21b");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S21b");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S21");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S21");
case MOD_DOORS:
if (model == VEHICLE_SLAMVAN3)
return HUD::GET_LABEL_TEXT_("SLVAN3_RDOOR");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("SLVAN3_RDOOR");
else
return HUD::GET_LABEL_TEXT_("CMM_MOD_S22");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S22");
case MOD_LIVERY:
return HUD::GET_LABEL_TEXT_("CMM_MOD_S23");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMM_MOD_S23");
default:
auto name = VEHICLE::GET_MOD_SLOT_NAME(vehicle, mod_slot);
if (name == nullptr)
return "";
if (strstr(name, "_"))
return HUD::GET_LABEL_TEXT_(name);
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(name);
return name;
}
}
@ -162,7 +162,7 @@ namespace big
{
if (horn_map.find(mod) != horn_map.end())
{
return HUD::GET_LABEL_TEXT_(horn_map.find(mod)->second);
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(horn_map.find(mod)->second);
}
return "";
}
@ -172,31 +172,31 @@ namespace big
if (mod == -1)
{
if (!VEHICLE::IS_THIS_MODEL_A_BIKE(model) && VEHICLE::IS_THIS_MODEL_A_BICYCLE(model))
return HUD::GET_LABEL_TEXT_("CMOD_WHE_0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_WHE_0");
else
return HUD::GET_LABEL_TEXT_("CMOD_WHE_B_0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_WHE_B_0");
}
if (mod >= mod_count / 2)
//return fmt::format("{} {}", HUD::GET_LABEL_TEXT_("CHROME"), HUD::GET_LABEL_TEXT_(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod))).c_str(); //Bug with FMT library? Returns Chrome Chrome...
return fmt::format("Chrome {}", HUD::GET_LABEL_TEXT_(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod))).c_str();
//return fmt::format("{} {}", HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CHROME"), HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod))).c_str(); //Bug with FMT library? Returns Chrome Chrome...
return fmt::format("Chrome {}", HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod))).c_str();
else
return HUD::GET_LABEL_TEXT_(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod));
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod));
}
switch (mod_slot)
{
case MOD_ARMOR:
return HUD::GET_LABEL_TEXT_(fmt::format("CMOD_ARM_{}", (mod + 1)).c_str());
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(fmt::format("CMOD_ARM_{}", (mod + 1)).c_str());
case MOD_BRAKES:
return HUD::GET_LABEL_TEXT_(fmt::format("CMOD_BRA_{}", (mod + 1)).c_str());
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(fmt::format("CMOD_BRA_{}", (mod + 1)).c_str());
case MOD_ENGINE:
if (mod == -1)
return HUD::GET_LABEL_TEXT_("CMOD_ARM_0");
return HUD::GET_LABEL_TEXT_(fmt::format("CMOD_ENG_{}", (mod + 1)).c_str());
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_ARM_0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(fmt::format("CMOD_ENG_{}", (mod + 1)).c_str());
case MOD_SUSPENSION:
return HUD::GET_LABEL_TEXT_(fmt::format("CMOD_SUS_{}", (mod + 1)).c_str());
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(fmt::format("CMOD_SUS_{}", (mod + 1)).c_str());
case MOD_TRANSMISSION:
return HUD::GET_LABEL_TEXT_(fmt::format("CMOD_GBX_{}", (mod + 1)).c_str());
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(fmt::format("CMOD_GBX_{}", (mod + 1)).c_str());
}
@ -204,12 +204,12 @@ namespace big
{
if (mod_slot == MOD_SIDESKIRT && VEHICLE::GET_NUM_VEHICLE_MODS(vehicle, MOD_SIDESKIRT) < 2)
{
return HUD::GET_LABEL_TEXT_("CMOD_SKI_1");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_SKI_1");
}
auto label = VEHICLE::GET_MOD_TEXT_LABEL(vehicle, mod_slot, mod);
if (label == nullptr || strlen(label) == 0)
return "MISSING_LABEL";
return HUD::GET_LABEL_TEXT_(label);
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION(label);
}
else
{
@ -223,12 +223,12 @@ namespace big
case VEHICLE_BANSHEE:
case VEHICLE_BANSHEE2:
case VEHICLE_SULTANRS:
return HUD::GET_LABEL_TEXT_("CMOD_COL5_41");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_COL5_41");
}
break;
}
return HUD::GET_LABEL_TEXT_("CMOD_DEF_0");
return HUD::GET_FILENAME_FOR_AUDIO_CONVERSATION("CMOD_DEF_0");
}
}

2
BigBaseV2/src/util/entity.hpp
View File

@ -29,7 +29,7 @@ namespace big::entity
{
ENTITY::DETACH_ENTITY(ent, 1, 1);
ENTITY::SET_ENTITY_VISIBLE(ent, false, false);
NETWORK::NETWORK_SET_ENTITY_INVISIBLE_TO_NETWORK_(ent, true);
NETWORK::NETWORK_SET_ENTITY_ONLY_EXISTS_FOR_PARTICIPANTS(ent, true);
ENTITY::SET_ENTITY_COORDS_NO_OFFSET(ent, 0, 0, 0, 0, 0, 0);
ENTITY::SET_ENTITY_AS_MISSION_ENTITY(ent, 1, 1);
ENTITY::SET_ENTITY_AS_NO_LONGER_NEEDED(&ent);

36
BigBaseV2/src/util/vehicle.hpp
View File

@ -437,8 +437,8 @@ namespace big::vehicle
VEHICLE::SET_VEHICLE_COLOURS(vehicle, owned_mods[MOD_PRIMARY_COL], owned_mods[MOD_SECONDARY_COL]);
VEHICLE::SET_VEHICLE_EXTRA_COLOURS(vehicle, owned_mods[MOD_PEARLESCENT_COL], owned_mods[MOD_WHEEL_COL]);
VEHICLE::SET_VEHICLE_INTERIOR_COLOR_(vehicle, owned_mods[MOD_INTERIOR_COL]);
VEHICLE::SET_VEHICLE_DASHBOARD_COLOR_(vehicle, owned_mods[MOD_DASHBOARD_COL]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_5(vehicle, owned_mods[MOD_INTERIOR_COL]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_6(vehicle, owned_mods[MOD_DASHBOARD_COL]);
if (owned_mods[MOD_PRIMARY_CUSTOM])
{
@ -467,22 +467,22 @@ namespace big::vehicle
if (owned_mods[MOD_XENON_LIGHTS])
{
VEHICLE::SET_VEHICLE_XENON_LIGHTS_COLOR_(vehicle, owned_mods[MOD_XENON_COL]);
VEHICLE::SET_VEHICLE_XENON_LIGHT_COLOR_INDEX(vehicle, owned_mods[MOD_XENON_COL]);
VEHICLE::TOGGLE_VEHICLE_MOD(vehicle, MOD_XENON_LIGHTS, owned_mods[MOD_XENON_LIGHTS]);
}
VEHICLE::SET_VEHICLE_NEON_LIGHTS_COLOUR_(
VEHICLE::SET_VEHICLE_NEON_COLOUR(
vehicle, owned_mods[MOD_NEON_COL_R],
owned_mods[MOD_NEON_COL_G], owned_mods[MOD_NEON_COL_B]
);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
VEHICLE::SET_VEHICLE_TYRES_CAN_BURST(vehicle, owned_mods[MOD_TIRE_CAN_BURST]);
VEHICLE::SET_DRIFT_TYRES_ENABLED_(vehicle, owned_mods[MOD_DRIFT_TIRE]);
VEHICLE::SET_DRIFT_TYRES(vehicle, owned_mods[MOD_DRIFT_TIRE]);
VEHICLE::TOGGLE_VEHICLE_MOD(vehicle, MOD_TURBO, owned_mods[MOD_TURBO]);
for (int slot = MOD_SPOILERS; slot <= MOD_LIGHTBAR; slot++)
@ -533,8 +533,8 @@ namespace big::vehicle
VEHICLE::GET_VEHICLE_COLOURS(vehicle, &owned_mods[MOD_PRIMARY_COL], &owned_mods[MOD_SECONDARY_COL]);
VEHICLE::GET_VEHICLE_EXTRA_COLOURS(vehicle, &owned_mods[MOD_PEARLESCENT_COL], &owned_mods[MOD_WHEEL_COL]);
VEHICLE::GET_VEHICLE_INTERIOR_COLOR_(vehicle, &owned_mods[MOD_INTERIOR_COL]);
VEHICLE::GET_VEHICLE_DASHBOARD_COLOR_(vehicle, &owned_mods[MOD_DASHBOARD_COL]);
VEHICLE::GET_VEHICLE_EXTRA_COLOUR_5(vehicle, &owned_mods[MOD_INTERIOR_COL]);
VEHICLE::GET_VEHICLE_EXTRA_COLOUR_6(vehicle, &owned_mods[MOD_DASHBOARD_COL]);
owned_mods[MOD_PRIMARY_CUSTOM] = VEHICLE::GET_IS_VEHICLE_PRIMARY_COLOUR_CUSTOM(vehicle);
if (owned_mods[MOD_PRIMARY_CUSTOM])
@ -566,20 +566,20 @@ namespace big::vehicle
owned_mods[MOD_XENON_LIGHTS] = VEHICLE::IS_TOGGLE_MOD_ON(vehicle, MOD_XENON_LIGHTS);
if (owned_mods[MOD_XENON_LIGHTS])
{
owned_mods[MOD_XENON_COL] = (int8_t)VEHICLE::GET_VEHICLE_XENON_LIGHTS_COLOR_(vehicle);
owned_mods[MOD_XENON_COL] = (int8_t)VEHICLE::GET_VEHICLE_XENON_LIGHT_COLOR_INDEX(vehicle);
}
owned_mods[MOD_NEON_LEFT_ON] = VEHICLE::IS_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_LEFT);
owned_mods[MOD_NEON_RIGHT_ON] = VEHICLE::IS_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_RIGHT);
owned_mods[MOD_NEON_FRONT_ON] = VEHICLE::IS_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_FRONT);
owned_mods[MOD_NEON_BACK_ON] = VEHICLE::IS_VEHICLE_NEON_LIGHT_ENABLED_(vehicle, NEON_BACK);
VEHICLE::GET_VEHICLE_NEON_LIGHTS_COLOUR_(
owned_mods[MOD_NEON_LEFT_ON] = VEHICLE::GET_VEHICLE_NEON_ENABLED(vehicle, NEON_LEFT);
owned_mods[MOD_NEON_RIGHT_ON] = VEHICLE::GET_VEHICLE_NEON_ENABLED(vehicle, NEON_RIGHT);
owned_mods[MOD_NEON_FRONT_ON] = VEHICLE::GET_VEHICLE_NEON_ENABLED(vehicle, NEON_FRONT);
owned_mods[MOD_NEON_BACK_ON] = VEHICLE::GET_VEHICLE_NEON_ENABLED(vehicle, NEON_BACK);
VEHICLE::GET_VEHICLE_NEON_COLOUR(
vehicle, &owned_mods[MOD_NEON_COL_R],
&owned_mods[MOD_NEON_COL_G], &owned_mods[MOD_NEON_COL_B]
);
owned_mods[MOD_TIRE_CAN_BURST] = VEHICLE::GET_VEHICLE_TYRES_CAN_BURST(vehicle);
owned_mods[MOD_DRIFT_TIRE] = VEHICLE::GET_DRIFT_TYRES_ENABLED_(vehicle);
owned_mods[MOD_DRIFT_TIRE] = VEHICLE::GET_DRIFT_TYRES_SET(vehicle);
owned_mods[MOD_TURBO] = VEHICLE::IS_TOGGLE_MOD_ON(vehicle, MOD_TURBO);
owned_mods[MOD_FRONTWHEEL_VAR] = VEHICLE::GET_VEHICLE_MOD_VARIATION(vehicle, MOD_FRONTWHEEL);

36
BigBaseV2/src/views/vehicle/view_lsc.cpp
View File

@ -238,7 +238,7 @@ namespace big
if (ImGui::Checkbox("Low Grip Tires", (bool*)&owned_mods[MOD_DRIFT_TIRE]))
{
g_fiber_pool->queue_job([] {
VEHICLE::SET_DRIFT_TYRES_ENABLED_(player_vehicle, owned_mods[MOD_DRIFT_TIRE]);
VEHICLE::SET_DRIFT_TYRES(player_vehicle, owned_mods[MOD_DRIFT_TIRE]);
});
}
@ -429,28 +429,28 @@ namespace big
if (ImGui::Checkbox("Left", (bool*)&owned_mods[MOD_NEON_LEFT_ON]))
{
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
});
}
ImGui::SameLine();
if (ImGui::Checkbox("Right", (bool*)&owned_mods[MOD_NEON_RIGHT_ON]))
{
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
});
}
ImGui::SameLine();
if (ImGui::Checkbox("Front", (bool*)&owned_mods[MOD_NEON_FRONT_ON]))
{
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
});
}
ImGui::SameLine();
if (ImGui::Checkbox("Back", (bool*)&owned_mods[MOD_NEON_BACK_ON]))
{
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
});
}
ImGui::SameLine();
@ -462,10 +462,10 @@ namespace big
owned_mods[MOD_NEON_BACK_ON] = true;
VEHICLE::TOGGLE_VEHICLE_MOD(player_vehicle, MOD_XENON_LIGHTS, owned_mods[MOD_XENON_LIGHTS]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
});
ImGui::SameLine();
components::button("Uncheck All##neon_uncheck_all", [] {
@ -476,10 +476,10 @@ namespace big
owned_mods[MOD_NEON_BACK_ON] = false;
VEHICLE::TOGGLE_VEHICLE_MOD(player_vehicle, MOD_XENON_LIGHTS, owned_mods[MOD_XENON_LIGHTS]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_LIGHT_ENABLED_(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_LEFT, owned_mods[MOD_NEON_LEFT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_RIGHT, owned_mods[MOD_NEON_RIGHT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_FRONT, owned_mods[MOD_NEON_FRONT_ON]);
VEHICLE::SET_VEHICLE_NEON_ENABLED(player_vehicle, NEON_BACK, owned_mods[MOD_NEON_BACK_ON]);
});
ImGui::Separator();
@ -696,7 +696,7 @@ namespace big
if (ImGui::Selectable(name.c_str(), false))
{
g_fiber_pool->queue_job([&rgb] {
VEHICLE::SET_VEHICLE_NEON_LIGHTS_COLOUR_(player_vehicle, rgb[0], rgb[1], rgb[2]);
VEHICLE::SET_VEHICLE_NEON_COLOUR(player_vehicle, rgb[0], rgb[1], rgb[2]);
});
*color_r = rgb[0];
*color_g = rgb[1];
@ -729,7 +729,7 @@ namespace big
VEHICLE::SET_VEHICLE_TYRE_SMOKE_COLOR(player_vehicle, *color_r, *color_g, *color_b);
break;
case 8:
VEHICLE::SET_VEHICLE_NEON_LIGHTS_COLOUR_(player_vehicle, *color_r, *color_g, *color_b);
VEHICLE::SET_VEHICLE_NEON_COLOUR(player_vehicle, *color_r, *color_g, *color_b);
break;
}
});
@ -905,7 +905,7 @@ namespace big
owned_mods[MOD_INTERIOR_COL] = color;
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_INTERIOR_COLOR_(player_vehicle, owned_mods[MOD_INTERIOR_COL]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_5(player_vehicle, owned_mods[MOD_INTERIOR_COL]);
});
}
}
@ -921,7 +921,7 @@ namespace big
owned_mods[MOD_DASHBOARD_COL] = color;
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_DASHBOARD_COLOR_(player_vehicle, owned_mods[MOD_DASHBOARD_COL]);
VEHICLE::SET_VEHICLE_EXTRA_COLOUR_6(player_vehicle, owned_mods[MOD_DASHBOARD_COL]);
});
}
}
@ -937,7 +937,7 @@ namespace big
owned_mods[MOD_XENON_COL] = color;
g_fiber_pool->queue_job([] {
VEHICLE::SET_VEHICLE_XENON_LIGHTS_COLOR_(player_vehicle, owned_mods[MOD_XENON_COL]);
VEHICLE::SET_VEHICLE_XENON_LIGHT_COLOR_INDEX(player_vehicle, owned_mods[MOD_XENON_COL]);
});
}
}