where-vessels: Rename "class" to "size", and display "Subclass" as "Class"

diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 40a50e4106a058567d63ef7a2f8898c0cae8cd50..1506f292ad13984327e95c1cd6f4561f4aca72e1 100755 (executable)
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -264,18 +264,18 @@ proc info-cache-update {} {
     }
 
     set f [open $info_cache/vessel-info]
-    glset vessel_class_data [read $f]
+    glset vessel_size_data [read $f]
     close $f
 }
 
-proc vesselclasses-init {} {
+proc vesselinfo-init {} {
     global vc_game2code vc_code2abbrev vc_code2full vc_codes
 
-    global vessel_class_data
-    manyset $vessel_class_data classinfos subclassinfos
+    global vessel_size_data
+    manyset $vessel_size_data sizeinfos subclassinfos
 
     set vc_codes {}
-    foreach {game code abbrev full} $classinfos {
+    foreach {game code abbrev full} $sizeinfos {
        if {![regexp {^[a-z][a-z]$} $code code]} { error "bad code" }
        if {![regexp {^[a-z][a-z]$} $abbrev abbrev]} { error "bad abbrev" }
        lappend vc_codes $code
@@ -347,7 +347,7 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
     global vc_code2abbrev
     upvar 1 $yvar y
 
-    manyset [split $code _] inport class subclass lockown xabbrev
+    manyset [split $code _] inport size subclass lockown xabbrev
 
     set stackx $x
     incr stackx 2
@@ -366,11 +366,11 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
        incr stackx
     }
     
-    upvar #0 vc_code2abbrev($class) vcabb
+    upvar #0 vc_code2abbrev($size) vcabb
     if {![info exists vcabb]} {
-       set vcabb vc-$class
+       set vcabb vc-$size
        image create bitmap icon/$vcabb -data \
-           [exec pbmtext -builtin fixed $class | pnminvert | pnmcrop >t.pnm]
+           [exec pbmtext -builtin fixed $size | pnminvert | pnmcrop >t.pnm]
     }
     canvas-horiz-stack stackx -1 $imy $bind \
            image -anchor nw -image icon/$vcabb
@@ -410,22 +410,22 @@ proc code2canvas {code canvas x yvar qty qtylen bind} {
 proc show-report-decode {code} {
     global vc_code2full
 
-    manyset [split $code _] inport classcode subclass lockown xabbrev
+    manyset [split $code _] inport sizecode subclass lockown xabbrev
     manyset [split $lockown ""] lock notown
     
     report-set inport [lindex {{At Sea} {In port}} $inport]
-    report-set class $vc_code2full($classcode)
+    report-set size $vc_code2full($sizecode)
 
     global smash_subclass
     if {$smash_subclass >= 2} {
-       report-set subclass "(Any subclass)"
+       report-set subclass "(Any class)"
     } elseif {[
               upvar #0 vsc_code2report($subclass) subclass_report
               info exists subclass_report
              ]} {
        report-set subclass $subclass_report
     } else {
-       report-set subclass "Subclass \"$subclass\""
+       report-set subclass "Class \"$subclass\""
     }
 
     report-set lock [lindex {
@@ -540,9 +540,9 @@ set smash_subclass 0
 set smash_owner 0
 
 proc smash-code {code} {
-    manyset [split $code _] inport class subclass lockown xabbrev
+    manyset [split $code _] inport size subclass lockown xabbrev
 
-    upvar #0 smash_sizemap($class) smclass
+    upvar #0 smash_sizemap($size) smsize
 
     global smash_subclass
     if {$smash_subclass > 1} {
@@ -571,7 +571,7 @@ proc smash-code {code} {
        4 { set lockown 33 }
     }
 
-    return [join [list $inport $smclass $subclass $lockown $xabbrev] _]
+    return [join [list $inport $smsize $subclass $lockown $xabbrev] _]
 }
 
 proc smash-prepare {} {
@@ -606,7 +606,7 @@ proc make-smashers {} {
        image val { expr 0 } { expr {"icon/$vc_code2abbrev($val)"} }
     $cw.0 configure -state disabled
 
-    make-radio-smasher subclass Subclass smash_subclass \
+    make-radio-smasher subclass Class smash_subclass \
        {Show Normal/LE Hide} 1 0
 
     make-radio-smasher owner Owner smash_owner \
@@ -764,21 +764,21 @@ proc vessel {vin} {
     set codel {}
     lappend codel [errexpect-arrayget-boolean vi inPort]
 
-    set gameclass [errexpect-arrayget vi vesselClass]
-    upvar #0 vc_game2code($gameclass) class
-    if {![info exists class]} {
-       set class "($gameclass)"
-       upvar #0 vc_code2abbrev($class) vcabb
-       set vcabb vc-$class
-       set data [exec pbmtext -builtin fixed " $gameclass " \
+    set gamesize [errexpect-arrayget vi vesselClass]
+    upvar #0 vc_game2code($gamesize) size
+    if {![info exists size]} {
+       set size "($gamesize)"
+       upvar #0 vc_code2abbrev($size) vcabb
+       set vcabb vc-$size
+       set data [exec pbmtext -builtin fixed " $gamesize " \
                 | pnminvert | pnmcrop | pbmtoxbm]
        debug "INVENTED ICON $vcabb $data"
        image create bitmap icon/$vcabb -data $data
            
        global vc_code2full
-       set vc_code2full($class) "Type \"$gameclass\""
+       set vc_code2full($size) "Type \"$gamesize\""
     }
-    lappend codel $class
+    lappend codel $size
 
     set gamesubclass [errexpect-arrayget vi vesselSubclass]
     upvar #0 vsc_game2code($gamesubclass) subclass
@@ -1293,7 +1293,7 @@ proc widgets-setup {} {
     #pack .cp.report.code -side top
     pack configure .cp.report.details -fill x
 
-    foreach sw {inport class subclass lock own xabbrev} {
+    foreach sw {inport size subclass lock own xabbrev} {
        label .cp.report.details.$sw -text { }
        pack .cp.report.details.$sw -side top -anchor w
     }
@@ -1394,7 +1394,7 @@ parseargs
 argdefaults
 httpclientsetup where-vessels
 info-cache-update
-vesselclasses-init
+vesselinfo-init
 load-chart
 widgets-setup
 make-filters