From a98e4a554c02b1b850a15a15ee6450d9392645d7 Mon Sep 17 00:00:00 2001
From: Luke Meyers <n.luke.meyers@gmail.com>
Date: Sat, 8 Feb 2020 18:54:53 -0800
Subject: [PATCH] fix battery charge stuff

---
 game/game.go    | 3 ++-
 game/physics.go | 2 +-
 gfx/gfx.go      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/game/game.go b/game/game.go
index 929b6a9..29c29b8 100644
--- a/game/game.go
+++ b/game/game.go
@@ -52,7 +52,8 @@ func maybePassBaton(s State, teamID int) State {
 func ActiveRacer(t Team) *Racer {
 	for _, r := range t.Racers {
 		if r.ID == t.Baton.HolderID {
-			return &r
+			rr := r
+			return &rr
 		}
 	}
 	return nil
diff --git a/game/physics.go b/game/physics.go
index 6666d19..818aac7 100644
--- a/game/physics.go
+++ b/game/physics.go
@@ -11,7 +11,7 @@ func accelerate(r Racer) Racer {
 	if r.Kinetics.A > r.Battery.Charge {
 		r.Kinetics.A = r.Battery.Charge
 	}
-	r.Battery.Charge -= r.Kinetics.A
+	r.Battery.Charge -= abs(r.Kinetics.A)
 
 	r.Kinetics.V += r.Kinetics.A
 	if r.Kinetics.V > MaxV {
diff --git a/gfx/gfx.go b/gfx/gfx.go
index 37c7a49..7596ed6 100644
--- a/gfx/gfx.go
+++ b/gfx/gfx.go
@@ -177,7 +177,7 @@ func renderRacer(ctx context, oldRacer, racer game.Racer, active bool, c pixel.R
 		im.Color = colornames.Yellow
 		im.Push(pos)
 		var lw float64
-		if i > racer.Battery.Charge {
+		if i >= racer.Battery.Charge {
 			lw = 1
 		}
 		im.Circle(w, lw)