get rid of system distances function

master
Jordan Orelli 6 years ago
parent ce94d3cdd2
commit 25d142fb8a

@ -43,7 +43,7 @@ func NewScan(origin *System, n Neighborhood) *scan {
return &scan{ return &scan{
origin: origin, origin: origin,
start: time.Now(), start: time.Now(),
results: make([]scanResult, 0, len(origin.Distances())), results: make([]scanResult, 0, len(n)),
neighborhood: n, neighborhood: n,
} }
} }
@ -55,7 +55,7 @@ func (s *scan) Tick(game *Game) {
} }
func (s *scan) Dead() bool { func (s *scan) Dead() bool {
return s.nextEchoIndex >= len(s.origin.Distances()) return s.neighborhood == nil
} }
func (s *scan) String() string { func (s *scan) String() string {

@ -120,37 +120,6 @@ type Ray struct {
dist float64 // distance in parsecs dist float64 // distance in parsecs
} }
func (s *System) Distances() []Ray {
if s.distances == nil {
s.distances = make([]Ray, 0, 551)
rows, err := db.Query(`
select edges.id_2, edges.distance
from edges
where edges.id_1 = ?
order by distance
;`, s.id)
if err != nil {
log_error("unable to query for system distances: %v", err)
return nil
}
for rows.Next() {
var (
r Ray
id int
dist float64
)
if err := rows.Scan(&id, &dist); err != nil {
log_error("unable to unpack Ray from sql result: %v", err)
continue
}
r.s = index[id]
r.dist = dist
s.distances = append(s.distances, r)
}
}
return s.distances
}
func (s *System) Bombed(bomber *Connection, frame int64) { func (s *System) Bombed(bomber *Connection, frame int64) {
if s.Shield != nil { if s.Shield != nil {
if s.Shield.Hit() { if s.Shield.Hit() {

Loading…
Cancel
Save