diff --git a/build-and-run.sh b/build-and-run.sh old mode 100644 new mode 100755 diff --git a/src/screenComponents/radarView.cpp b/src/screenComponents/radarView.cpp index 51a7f70a61..c9ff2e9b72 100644 --- a/src/screenComponents/radarView.cpp +++ b/src/screenComponents/radarView.cpp @@ -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::infinity()) missile_target_angle = firing_solution; } diff --git a/src/screens/crew6/engineeringScreen.cpp b/src/screens/crew6/engineeringScreen.cpp index 4d41d095ab..8efa6325de 100644 --- a/src/screens/crew6/engineeringScreen.cpp +++ b/src/screens/crew6/engineeringScreen.cpp @@ -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); }); @@ -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)