Add Relay keybinds to Operations

Author: oznogon

src/gui/hotkeyConfig.cpp

@@ -313,9 +313,9 @@ Keys::Keys() :
     relay_alert_level_none("RELAY_ALERT_NONE"),
     relay_alert_level_yellow("RELAY_ALERT_YELLOW"),
     relay_alert_level_red("RELAY_ALERT_RED"),
-    relay_open_comms("RELAY_OPEN_COMMS", "C"),
+    relay_open_comms("RELAY_OPEN_COMMS", "M"),
     relay_start_hacking("RELAY_START_HACKING", "H"),
-    relay_link_to_science("RELAY_LINK_TO_SCIENCE", "S"),
+    relay_link_to_science("RELAY_LINK_TO_SCIENCE", "K"),
     relay_toggle_waypoint("RELAY_TOGGLE_WAYPOINT", "W"),
     relay_delete_waypoint("RELAY_DELETE_WAYPOINT", "Delete"),
     relay_launch_probe("RELAY_LAUNCH_PROBE", "L"),

src/screens/crew4/operationsScreen.cpp

@@ -117,31 +117,69 @@ OperationScreen::OperationScreen(GuiContainer* owner)
     info_reputation->setTextSize(20)->setSize(200, 40);
 
     // Scenario clock display.
-
     info_clock = new GuiKeyValueDisplay(stats, "INFO_CLOCK", 0.55f, tr("Clock") + ":", "");
     info_clock->setTextSize(20)->setSize(200, 40);
 
     mode = TargetSelection;
 
-    new ShipsLog(this);
-    (new GuiCommsOverlay(this))->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
+    ships_log = new ShipsLog(this);
+    comms_overlay = new GuiCommsOverlay(this);
+    comms_overlay->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);
 }
 
 void OperationScreen::onDraw(sp::RenderTarget& target)
 {
     GuiOverlay::onDraw(target);
 
     if (!my_spaceship) return;
+
     if (science->radar_view->isVisible())
     {
-        info_reputation->setValue(string(Faction::getInfo(my_spaceship).reputation_points, 0))->show();
-
-        // Update mission clock
-        info_clock->setValue(gameGlobalInfo->getMissionTime())->show();
+        // Update reputation counter.
+        info_reputation
+            ->setValue(string(Faction::getInfo(my_spaceship).reputation_points, 0))
+            ->show();
+
+        // Update mission clock.
+        info_clock
+            ->setValue(gameGlobalInfo->getMissionTime())
+            ->show();
     }
     else
     {
         info_reputation->hide();
         info_clock->hide();
     }
 }
+
+void OperationScreen::onUpdate()
+{
+    // Relay keybinds, copied from Relay screen.
+    // Don't process hotkeys while the chat text entry has keyboard focus.
+    if (comms_overlay && comms_overlay->isChatEntryFocused()) return;
+
+    // Open comms with the selected target.
+    if (keys.relay_open_comms.getDown())
+    {
+        auto target = science->targets.get();
+        if (target) my_player_info->commandOpenTextComm(target);
+    }
+
+    // Toggle waypoint placement mode.
+    if (keys.relay_toggle_waypoint.getDown())
+    {
+        if (mode == TargetSelection) mode = WaypointPlacement;
+        else if (mode == WaypointPlacement) mode = TargetSelection;
+    }
+
+    // Delete the selected waypoint.
+    if (keys.relay_delete_waypoint.getDown())
+    {
+        if (science->targets.getWaypointIndex() >= 0)
+            my_player_info->commandRemoveWaypoint(science->targets.getWaypointIndex());
+    }
+
+    // Toggle ship's log min/maximized state.
+    if (ships_log && keys.relay_toggle_ships_log.getDown())
+        ships_log->toggle();
+}

src/screens/crew4/operationsScreen.h

@@ -5,8 +5,10 @@
 class GuiOverlay;
 class GuiKeyValueDisplay;
 class GuiButton;
+class GuiCommsOverlay;
 class GuiToggleButton;
 class ScienceScreen;
+class ShipsLog;
 
 class OperationScreen : public GuiOverlay
 {
@@ -29,8 +31,13 @@ class OperationScreen : public GuiOverlay
     GuiToggleButton* place_waypoint_button;
     GuiButton* delete_waypoint_button;
 
+    GuiCommsOverlay* comms_overlay;
+    ShipsLog* ships_log;
+
     glm::vec2 mouse_down_position{0, 0};
 public:
     OperationScreen(GuiContainer* owner);
+
     virtual void onDraw(sp::RenderTarget& target) override;
+    virtual void onUpdate() override;
 };