From d8e106c497d2c109e1668d418b465707b882c2fc Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 5 Apr 2024 20:10:45 +0200
Subject: [PATCH] exclude player from IsClickable query, add name to
 MeteorAceGT

---
 src/defs.txt | 5 ++---
 src/hud.rs   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/defs.txt b/src/defs.txt
index 39c7564..6d78378 100644
--- a/src/defs.txt
+++ b/src/defs.txt
@@ -22,9 +22,9 @@ actor 0 593051 0 suit
     thrust 1.2 1 1 300 1.5
     rotationy 0.65
     engine monopropellant
-    clickable no
 
 actor 10 -30 20 MeteorAceGT
+    name "MeteorAceGT™"
     relativeto player
     scale 5
     vehicle yes
@@ -34,7 +34,6 @@ actor 10 -30 20 MeteorAceGT
     camdistance 50
     mass 3000
     angularmomentum 0.1 0.1 0.3
-    clickable no
 
 actor 0 0 0 io
     name Io
@@ -147,6 +146,7 @@ actor -3300 10 0 pizzeria
     rotationy 0.30
     angularmomentum 0 0 0
     actor -120 0 20 MeteorAceGT
+        name "MeteorAceGT™"
         relativeto pizzeria
         scale 5
         vehicle yes
@@ -156,7 +156,6 @@ actor -3300 10 0 pizzeria
         camdistance 50
         mass 3000
         angularmomentum 0 0 0.2
-        clickable no
     actor -100 63 -13 pizzasign
         name "Pizzeria Sign"
         relativeto pizzeria
diff --git a/src/hud.rs b/src/hud.rs
index 12e12b9..3123558 100644
--- a/src/hud.rs
+++ b/src/hud.rs
@@ -575,7 +575,7 @@ fn handle_input(
     mut ew_sfx: EventWriter<audio::PlaySfxEvent>,
     mut ew_togglemusic: EventWriter<audio::ToggleMusicEvent>,
     mut ambient_light: ResMut<AmbientLight>,
-    q_objects: Query<(Entity, &Transform), (With<IsClickable>, Without<IsTargeted>)>,
+    q_objects: Query<(Entity, &Transform), (With<IsClickable>, Without<IsTargeted>, Without<actor::PlayerDrivesThis>, Without<actor::Player>)>,
     q_target: Query<Entity, With<IsTargeted>>,
     q_camera: Query<&Transform, With<Camera>>,
 ) {