X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/rocl/blobdiff_plain/44649ec5bc84753e3ae7714e698f23304b04e744..5a74fac289a7d687527c4cad2eb5b9fcd62a5135:/elite-editor?ds=sidebyside diff --git a/elite-editor b/elite-editor index 360f05b..f367c1c 100755 --- a/elite-editor +++ b/elite-editor @@ -110,7 +110,7 @@ proc help-menu {m} { #----- Map editing machinery ------------------------------------------------ -tab col red orange yellow green blue magenta violet white +_tab col red orange yellow green blue magenta violet white set seq 0 set nwin 0 @@ -152,7 +152,7 @@ proc colour-by {seq} { set tl .map-$seq global col switch -exact -- $map(colourby) { - off { + off { foreach-world $map(galaxy) p { $tl.map itemconfigure $p(seed) -fill white -outline white } @@ -300,7 +300,7 @@ proc hide-path {seq} { } } -proc path-to-text {seq} { +proc path-to-text {seq} { upvar \#0 map-$seq map set t {} foreach n $map(path) { @@ -340,7 +340,7 @@ proc list-path {seq} { $tl.text delete 1.0 end $tl.text insert end [path-to-text $seq] $tl.text configure -state disabled -} +} proc load-path {seq} { upvar \#0 map-$seq map @@ -375,7 +375,7 @@ proc load-path {seq} { $tl.menu.path entryconfigure $i -state normal } show-path $seq -} +} proc show-shortest-path {seq weight} { upvar \#0 map-$seq map @@ -580,7 +580,7 @@ proc set-selection {seq p} { foreach i {5 6 7 8 9} { $tl.menu.path entryconfigure $i -state normal } -} +} proc do-select {seq x y} { set-selection $seq [find-click $seq $x $y] @@ -682,7 +682,7 @@ proc map-set-title {seq} { } proc map-set-galaxy {seq ng g} { - upvar \#0 map-$seq map + upvar \#0 map-$seq map if {[string equal $g $map(galaxy)]} { return } set map(galaxy-num) $ng map-set-title $seq @@ -736,7 +736,7 @@ proc map-new {ng g} { $tl.info.ldest $tl.info.dest \ $tl.info.ldist $tl.info.dist \ -side left -pady 2 - + scrollbar $tl.hscr -orient horizontal \ -command [list $tl.map xview] scrollbar $tl.vscr -orient vertical \ @@ -785,7 +785,7 @@ proc map-new {ng g} { $tl.menu.path add command -label "Load path..." \ -command [list load-path $seq] $tl.menu.path add command -label "Save path..." -state disabled \ - -command [list save-path $seq] + -command [list save-path $seq] $tl.menu.path add command -label "List path..." -state disabled \ -command [list list-path $seq] $tl.menu.path add separator @@ -857,7 +857,7 @@ proc integerp {min max n} { proc galaxyp {s} { if {![regexp {^[0-9a-fA-F]{12}$} $s]} { return 0 } return 1 -} +} proc cmdr-do-validate {seq widget check value} { upvar \#0 cmdr-$seq cmdr @@ -1109,15 +1109,15 @@ proc cmdr-open {seq} { foreach {tag label kind} [list \ mission "Mission" { entry 2 255 } \ score "Rating" { dropbox 65535 \ - "Harmless" 0 \ - "Mostly harmless" 8 \ + "Harmless" 0 \ + "Mostly harmless" 8 \ "Poor" 16 \ - "Average" 32 \ + "Average" 32 \ "Above average" 64 \ - "Competent" 128 \ - "Dangerous" 512 \ - "Deadly" 2560 \ - "Elite" 6400 } \ + "Competent" 128 \ + "Dangerous" 512 \ + "Deadly" 2560 \ + "Elite" 6400 } \ legal-status "Legal status" { dropbox 255 \ "Clean" 0 \ "Offender" 1 \ @@ -1127,7 +1127,7 @@ proc cmdr-open {seq} { fuel "Fuel" { tenth 4 25.5 } \ missiles "Missiles" { entry 4 255 } \ energy-unit "Energy unit" { dropbox 255 \ - "None" 0 \ + "None" 0 \ "Standard" 1 \ "Naval" 2 } \ front-laser "Front laser" $laser \ @@ -1207,7 +1207,7 @@ proc cmdr-open {seq} { cmdr-validate-widget $seq $tl.gal-number [list integerp 1 8] checkbutton $tl.std-gal -text "Standard galaxy" \ -variable cmdr-${seq}(std-gal) -justify left \ - -command [list cmdr-std-gal $seq] + -command [list cmdr-std-gal $seq] entry-on-change $tl.gal-number [list cmdr-set-gal-num $seq] grid configure $tl.l-gal-number -row $r -column 0 -sticky e -padx 1 -pady 1 grid configure $tl.std-gal -row $r -column 1 -sticky w -padx 1 -pady 1