Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds engine controls to electronic controls & tweaks portable generator #2633

Merged
merged 6 commits into from
Apr 13, 2023
Merged

Adds engine controls to electronic controls & tweaks portable generator #2633

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f07147
initial
MrLostman Apr 13, 2023
fd786ab
Format src/vehicle_use.cpp
MrLostman Apr 13, 2023
97b8bc9
Merge branch 'cataclysmbnteam:upload' into ec-controls-engines
MrLostman Apr 13, 2023
3582ccd
Only shows engine options when there is one
MrLostman Apr 13, 2023
39cdf90
Format src/vehicle_use.cpp 2
MrLostman Apr 13, 2023
5f3a821
Format src/vehicle_use.cpp 3
MrLostman Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/vehicles/utility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
{ "x": 1, "y": 0, "part": "frame_cover" },
{ "x": 1, "y": 0, "part": "tank_small", "fuel": "gasoline" },
{ "x": 1, "y": 0, "part": "stowboard_vertical" },
{ "x": 1, "y": 0, "part": "controls" },
{ "x": 1, "y": 0, "part": "controls_electronic" },
{ "x": 1, "y": 0, "parts": [ "wheel_mount_light", "wheel_small" ] }
],
"items": [
Expand Down
17 changes: 17 additions & 0 deletions src/vehicle_use.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,23 @@ void vehicle::control_electronics()

set_electronics_menu_options( options, actions );

if( has_part( "ENGINE" ) ) {
options.emplace_back( engine_on ? _( "Turn off the engine" ) : _( "Turn on the engine" ),
keybind( "TOGGLE_ENGINE" ) );
actions.push_back( [&] {
if( engine_on )
{
engine_on = false;
stop_engines();
} else
{
start_engines();
valid_option = false;
}
refresh();
} );
}

MrLostman marked this conversation as resolved.
Show resolved Hide resolved
MrLostman marked this conversation as resolved.
Show resolved Hide resolved
uilist menu;
menu.text = _( "Electronics controls" );
menu.entries = options;
Expand Down