From 56746b00416fa0401b1861ab6f42719eba42d474 Mon Sep 17 00:00:00 2001
From: Louis Pearson <louispearson@librem.one>
Date: Wed, 2 Feb 2022 00:06:36 -0700
Subject: [PATCH] Allow interaction with plug centered on player

---
 src/game.zig | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/game.zig b/src/game.zig
index fa4d32e..bf2078a 100644
--- a/src/game.zig
+++ b/src/game.zig
@@ -399,6 +399,21 @@ fn getNearestCircuitInteraction(pos: Vec2f) ?Interaction {
     return null;
 }
 
+fn getNearestPlugInteraction(pos: Vec2f, wireID: usize, which: usize) ?Interaction {
+    const cell = util.world2cell(pos);
+    if (circuit.get_cell(cell)) |tile| {
+        if (Circuit.is_plug(tile)) {
+            const active = circuit.isEnabled(cell);
+            return Interaction{
+                .details = .{ .plug = .{ .wireID = wireID, .which = which } },
+                .pos = cell * Map.tile_size + Vec2{ 4, 4 },
+                .active = active,
+            };
+        }
+    }
+    return null;
+}
+
 fn getNearestWireInteraction(pos: Vec2f, range: f32) ?Interaction {
     var newIndicator: ?Interaction = null;
     var minDistance: f32 = range;
@@ -451,7 +466,6 @@ fn manipulationProcess(pos: *Pos, control: *Control) void {
             indicator = i;
         }
     } else if (control.grabbing) |details| {
-        const cell = util.world2cell(offsetPos);
         var wire = &wires.slice()[details.id];
         var nodes = wire.nodes.slice();
 
@@ -465,13 +479,10 @@ fn manipulationProcess(pos: *Pos, control: *Control) void {
             nodes[details.which].pos = pos.pos + Vec2f{ 0, -4 };
         }
 
-        if (Circuit.is_plug(circuit.get_cell(cell) orelse 0)) {
-            const active = circuit.isEnabled(cell);
-            indicator = .{
-                .details = .{ .plug = .{ .wireID = details.id, .which = details.which } },
-                .pos = cell * Map.tile_size + Vec2{ 4, 4 },
-                .active = active,
-            };
+        if (getNearestPlugInteraction(offsetPos, details.id, details.which)) |i| {
+            indicator = i;
+        } else if (getNearestPlugInteraction(centeredPos, details.id, details.which)) |i| {
+            indicator = i;
         } else if (input.btnp(.one, .two)) {
             nodes[details.which].pinned = false;
             control.grabbing = null;