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

Various fixes (#1983)

Browse Source 
* Closes #1928
* Closes #1925
* Closes #1864
This commit is contained in:
T14D3 2023-08-19 13:01:59 +02:00 committed by GitHub
parent 5eead0436f
commit 6c1e821d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/backend/looped/vehicle/turn_signals.cpp
View File

@ -37,6 +37,8 @@ namespace big
std::optional<std::chrono::system_clock::time_point> queued_left_turn_signal; std::optional<std::chrono::system_clock::time_point> queued_left_turn_signal;
std::optional<std::chrono::system_clock::time_point> queued_right_turn_signal; std::optional<std::chrono::system_clock::time_point> queued_right_turn_signal;
bool hazzards = false; bool hazzards = false;
bool left;
bool right;
void update_key_state(key_state& key_last_tick) void update_key_state(key_state& key_last_tick)
{ {
@ -99,6 +101,10 @@ namespace big
VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::left, on); VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::left, on);
VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::right, off); VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::right, off);
break; break;
default:
VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::left, off);
VEHICLE::SET_VEHICLE_INDICATOR_LIGHTS(self::veh, signal_state::right, off);
} }
} }
} }
@ -112,18 +118,33 @@ namespace big
{ {
update_key_states(); update_key_states();
if (left_signal_key.state == key_state::just_pressed || g.vehicle.auto_turn_signals && PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_LEFT_ONLY)
if (left_signal_key.state == key_state::just_pressed && !left || g.vehicle.auto_turn_signals && PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_LEFT_ONLY)
|| queued_left_turn_signal.has_value() && queued_left_turn_signal.value() - std::chrono::system_clock::now() > 1500ms) || queued_left_turn_signal.has_value() && queued_left_turn_signal.value() - std::chrono::system_clock::now() > 1500ms)
{ {
set_turn_signals(signal_state::left, true); set_turn_signals(signal_state::left, true);
queued_left_turn_signal = std::nullopt; queued_left_turn_signal = std::nullopt;
left = true;
} }
if (right_signal_key.state == key_state::just_pressed || g.vehicle.auto_turn_signals && PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_RIGHT_ONLY) else if (left_signal_key.state == key_state::just_pressed && left || !g.vehicle.turn_signals)
{
set_turn_signals(signal_state::left, false);
left = false;
}
if (right_signal_key.state == key_state::just_pressed && !right || g.vehicle.auto_turn_signals && PAD::IS_CONTROL_PRESSED(0, (int)ControllerInputs::INPUT_VEH_MOVE_RIGHT_ONLY)
|| queued_right_turn_signal.has_value() && queued_right_turn_signal.value() - std::chrono::system_clock::now() > 1500ms) || queued_right_turn_signal.has_value() && queued_right_turn_signal.value() - std::chrono::system_clock::now() > 1500ms)
{ {
set_turn_signals(signal_state::right, true); set_turn_signals(signal_state::right, true);
queued_right_turn_signal = std::nullopt; queued_right_turn_signal = std::nullopt;
right = true;
}
else if (right_signal_key.state == key_state::just_pressed && right || !g.vehicle.turn_signals)
{
set_turn_signals(signal_state::right, false);
right = false;
} }
if (hazzards_key.state == key_state::just_pressed && !hazzards) if (hazzards_key.state == key_state::just_pressed && !hazzards)

6
src/backend/looped/weapons/increase_damage.cpp
View File

@ -25,6 +25,12 @@ namespace big
WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, g.weapons.increased_damage); WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, g.weapons.increased_damage);
} }
} }
virtual void on_disable() override
{
Hash weapon{};
WEAPON::GET_CURRENT_PED_WEAPON(self::ped, &weapon, 0);
WEAPON::SET_WEAPON_DAMAGE_MODIFIER(weapon, 1);
}
}; };
increased_damage increased_damage

3
src/core/data/lsc_types.hpp
View File

@ -160,7 +160,7 @@ static const std::map<int, std::string> lsc_headlight_colors = {
{XENON_PONY_PINK, "Pony Pink"}, {XENON_PONY_PINK, "Pony Pink"},
{XENON_HOT_PINK, "Hot Pink"}, {XENON_HOT_PINK, "Hot Pink"},
{XENON_PURPLE, "Purple"}, {XENON_PURPLE, "Purple"},
{XENON_BACKLIGHT, "Backlight"}, {XENON_BLACKLIGHT, "Blacklight"},
}; };
static const std::map<int, std::string> lsc_missing_horns = { static const std::map<int, std::string> lsc_missing_horns = {
@ -201,4 +201,5 @@ static const std::map<std::string, std::vector<int>> lsc_neon_rgb = {
{"Pony Pink", {NEON_COLOR_PONYPINK}}, {"Pony Pink", {NEON_COLOR_PONYPINK}},
{"Hot Pink", {NEON_COLOR_HOTPINK}}, {"Hot Pink", {NEON_COLOR_HOTPINK}},
{"Purple", {NEON_COLOR_PURPLE}}, {"Purple", {NEON_COLOR_PURPLE}},
{"Blacklight", {NEON_COLOR_BLACKLIGHT}},
}; };

6
src/gta/vehicle_values.hpp
View File

@ -690,7 +690,7 @@ enum HeadlightColors
XENON_PONY_PINK, XENON_PONY_PINK,
XENON_HOT_PINK, XENON_HOT_PINK,
XENON_PURPLE, XENON_PURPLE,
XENON_BACKLIGHT XENON_BLACKLIGHT
}; };
#define NEON_COLOR_WHITE 222, 222, 255 #define NEON_COLOR_WHITE 222, 222, 255
@ -702,10 +702,10 @@ enum HeadlightColors
#define NEON_COLOR_GOLDENSHOWER 255, 150, 5 #define NEON_COLOR_GOLDENSHOWER 255, 150, 5
#define NEON_COLOR_ORANGE 255, 62, 0 #define NEON_COLOR_ORANGE 255, 62, 0
#define NEON_COLOR_RED 255, 1, 1 #define NEON_COLOR_RED 255, 1, 1
#define NEON_COLOR_PONYPINK 255, 50, 100//Fag #define NEON_COLOR_PONYPINK 255, 50, 100
#define NEON_COLOR_HOTPINK 255, 5, 190 #define NEON_COLOR_HOTPINK 255, 5, 190
#define NEON_COLOR_PURPLE 35, 1, 255 #define NEON_COLOR_PURPLE 35, 1, 255
#define NEON_COLOR_BACKLIGHT 15, 3, 255 #define NEON_COLOR_BLACKLIGHT 15, 3, 255
#define TIRESMOKE_COLOR_WHITE 255, 255, 255 #define TIRESMOKE_COLOR_WHITE 255, 255, 255
#define TIRESMOKE_COLOR_BLACK 20, 20, 20 #define TIRESMOKE_COLOR_BLACK 20, 20, 20