updated go to 1.21

moltenwolfcub · Aug 22, 2023 · f1c4f42 · f1c4f42
1 parent de98f4d
commit f1c4f42
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/game/lineart.go b/game/lineart.go
@@ -2,7 +2,6 @@ package game
 
 import (
 	"image"
-	"math"
 
 	"github.com/hajimehoshi/ebiten/v2"
 )
@@ -164,9 +163,9 @@ func (l lineartEnd) getCheckEnd(rect image.Rectangle) (point image.Point) {
 func (l lineartEnd) minMax(pos float64, potentialNew float64) (newPos float64) {
 	switch l {
 	case startSide:
-		newPos = math.Max(pos, potentialNew)
+		newPos = max(pos, potentialNew)
 	case endSide:
-		newPos = math.Min(pos, potentialNew)
+		newPos = min(pos, potentialNew)
 	}
 	return
 }

diff --git a/game/player.go b/game/player.go
@@ -74,10 +74,10 @@ func (p Player) findBounds(layer GameContext) image.Rectangle {
 	minX, minY := math.MaxFloat64, math.MaxFloat64
 	maxX, maxY := -math.MaxFloat64, -math.MaxFloat64
 	for _, seg := range p.GetHitbox(layer) {
-		minX = math.Min(float64(seg.Min.X), minX)
-		minY = math.Min(float64(seg.Min.Y), minY)
-		maxX = math.Max(float64(seg.Max.X), maxX)
-		maxY = math.Max(float64(seg.Max.Y), maxY)
+		minX = min(float64(seg.Min.X), minX)
+		minY = min(float64(seg.Min.Y), minY)
+		maxX = max(float64(seg.Max.X), maxX)
+		maxY = max(float64(seg.Max.Y), maxY)
 	}
 	bounds := image.Rect(int(minX), int(minY), int(maxX), int(maxY))
 	return bounds

diff --git a/game/river.go b/game/river.go
@@ -43,10 +43,10 @@ func (r River) findBounds(layer GameContext) image.Rectangle {
 	minX, minY := math.MaxFloat64, math.MaxFloat64
 	maxX, maxY := -math.MaxFloat64, -math.MaxFloat64
 	for _, seg := range r.GetHitbox(layer) {
-		minX = math.Min(float64(seg.Min.X), minX)
-		minY = math.Min(float64(seg.Min.Y), minY)
-		maxX = math.Max(float64(seg.Max.X), maxX)
-		maxY = math.Max(float64(seg.Max.Y), maxY)
+		minX = min(float64(seg.Min.X), minX)
+		minY = min(float64(seg.Min.Y), minY)
+		maxX = max(float64(seg.Max.X), maxX)
+		maxY = max(float64(seg.Max.Y), maxY)
 	}
 	bounds := image.Rect(int(minX), int(minY), int(maxX), int(maxY))
 	return bounds

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/moltenwolfcub/Forest-Game
 
-go 1.20
+go 1.21
 
 require github.com/hajimehoshi/ebiten/v2 v2.5.1