From: mdw <mdw>
Date: Mon, 3 Mar 2003 10:42:04 +0000 (+0000)
Subject: Disallow coinicident planet choice.
X-Git-Tag: 1.0.2^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/rocl/commitdiff_plain/8bdcaa8bc4ec2847020075cfc3f6cf03fb9a798f

Disallow coinicident planet choice.
---

diff --git a/elite-cmdr b/elite-cmdr
index cc8bb50..d94b04b 100755
--- a/elite-cmdr
+++ b/elite-cmdr
@@ -90,12 +90,19 @@ proc dump/world {a} {
 }
 proc set/world {a v} {
   global cmdr
+  set ww [worldinfo $cmdr(gal-seed)]
   set s [parse-planet-spec $cmdr(gal-seed) $v]
   if {[string equal $s ""]} { error "bad planet spec `$v'" }
   if {![in-galaxy-p $cmdr(gal-seed) $s]} {
     error "planet `[worldname $s]' not in galaxy $cmdr(gal-seed)"
   }
   elite-worldinfo p $s
+  set ss [nearest-planet $ww $p(x) $p(y)]
+  if {![string equal $s $ss]} {
+    set n $p(name)
+    elite-worldinfo p $ss
+    puts stderr "can't dock at $n: $p(name) is coincident"
+  }
   set cmdr(world-x) [expr {$p(x)/4}]
   set cmdr(world-y) [expr {$p(y)/2}]
 }