Skip to content

changes, but make them tidy #27

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

Open
BCcybernat wants to merge 2 commits into
base: main
Choose a base branch
from
Open

changes, but make them tidy #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad13045
changes, but make them tidy
BCcybernat Mar 9, 2024
34a47b5
Update build-and-run.sh
BCcybernat Mar 25, 2024
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
Empty file modified build-and-run.sh
100644 → 100755
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion src/screenComponents/radarView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void GuiRadarView::drawTargetProjections(sf::RenderTarget& window)
{
missile_target_angle = missile_tube_controls->getMissileTargetAngle();
}else{
float firing_solution = target_spaceship->weapon_tube[n].calculateFiringSolution(target_spaceship->getTarget());
float firing_solution = target_spaceship->weapon_tube[n].calculateFiringSolution(my_spaceship->getTarget(PreferencesManager::get("weapons_specific_station", "0").toInt()));
if (firing_solution != std::numeric_limits<float>::infinity())
missile_target_angle = firing_solution;
}
Expand Down
4 changes: 2 additions & 2 deletions src/screens/crew6/engineeringScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ EngineeringScreen::EngineeringScreen(GuiContainer* owner, ECrewPosition crew_pos
{
repair_label = new GuiLabel(box, "COOLANT_LABEL", tr("slider", "Repair"), 30);
repair_label->setAlignment(ACenterLeft)->setPosition(20, 220, ATopLeft)->setSize(400, 20);
repair_slider = new GuiSlider(box, "COOLANT_SLIDER", 0.0, 10.0, 0.0, [this](float value) {
repair_slider = new GuiSlider(box, "COOLANT_SLIDER", 10.0, 0.0, 0.0, [this](float value) {
if (my_spaceship && selected_system != SYS_None)
my_spaceship->commandSetSystemRepairRequest(selected_system, value);
});
Expand Down Expand Up @@ -476,7 +476,7 @@ void EngineeringScreen::onDraw(sf::RenderTarget& window)
power_slider->setValue(system.power_request);
coolant_label->setText(tr("Coolant: {coolant_level}%/{coolant_request}%").format({{"coolant_level", string(int(system.coolant_level / my_spaceship->max_coolant_per_system * 100))},{"coolant_request", string(int(std::min(system.coolant_request, my_spaceship->max_coolant) / my_spaceship->max_coolant_per_system * 100))}}));
coolant_slider->setEnable(!my_spaceship->auto_coolant_enabled);
coolant_slider->setRange(0.0, my_spaceship->max_coolant_per_system);
coolant_slider->setRange(my_spaceship->max_coolant_per_system, 0.0);
coolant_slider->setValue(std::min(system.coolant_request, my_spaceship->max_coolant));

if (gameGlobalInfo->use_nano_repair_crew)
Expand Down