Skip to content

Commit aec3476

Browse files
* Set indicators with method call instead of directly.
* Made hazard light function
1 parent 079e69f commit aec3476

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

main.cs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class Main : Script
1313
Ped playerCharacter = Game.Player.Character;
1414
bool isSirenSilent;
1515
bool leftIndicator, rightIndicator;
16+
bool hazards;
1617

1718
Keys sirenToggleKey, beamToggleKey, interiorLightToggleKey, leftIndicatorKey, rightIndicatorKey;
1819
GTA.Control sirenToggleButton, beamToggleButton, leftIndicatorButton, rightIndicatorButton;
@@ -56,6 +57,7 @@ private void OnTick(object sender, EventArgs e)
5657
GamePad();
5758
}
5859

60+
#region Input
5961
private void OnKeyDown(object sender, KeyEventArgs e)
6062
{
6163
if (playerCharacter.CurrentVehicle != null)
@@ -91,6 +93,7 @@ private void GamePad()
9193
if (Game.IsControlJustPressed(rightIndicatorButton))
9294
ToggleRightIndicator();
9395
}
96+
#endregion
9497

9598
private void ToggleSiren()
9699
{
@@ -114,13 +117,20 @@ private void ToggleInteriorLights()
114117
playerCharacter.CurrentVehicle.IsInteriorLightOn = !playerCharacter.CurrentVehicle.IsInteriorLightOn;
115118
}
116119

120+
#region Indicators
121+
private void ToggleHazards()
122+
{
123+
hazards = !hazards;
124+
SetIndicators(hazards, hazards);
125+
}
126+
117127
private void ToggleRightIndicator()
118128
{
119129
if (leftIndicator)
120130
ToggleLeftIndicator();
121-
131+
122132
rightIndicator = !rightIndicator;
123-
playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
133+
SetIndicators(false, rightIndicator);
124134
}
125135

126136
private void ToggleLeftIndicator()
@@ -129,7 +139,14 @@ private void ToggleLeftIndicator()
129139
ToggleRightIndicator();
130140

131141
leftIndicator = !leftIndicator;
142+
SetIndicators(leftIndicator);
143+
}
144+
145+
private void SetIndicators(bool leftIndicator = false, bool rightIndicator = false)
146+
{
132147
playerCharacter.CurrentVehicle.IsLeftIndicatorLightOn = leftIndicator;
148+
playerCharacter.CurrentVehicle.IsRightIndicatorLightOn = rightIndicator;
133149
}
150+
#endregion
134151
}
135152
}

0 commit comments

Comments
 (0)