Add networking

base.go

@@ -1,38 +1,44 @@
 package main
 
-import "github.com/veandco/go-sdl2/sdl"
+import (
+	"github.com/veandco/go-sdl2/sdl"
+	"image/color"
+)
 
 type Base struct {
-	owner        *Player
+	ownerID      uint32
 	openingWidth int32
 	gameObject   *GameObject
 }
 
-func (base *Base) tick(players *[]*Player) {
-	for _, player := range *players {
+func (base *Base) tick(players map[uint32]*Player) {
+	for playerID, player := range players {
 		if player.gameObject.baseRect.HasIntersection(&base.gameObject.baseRect) {
-			if player.rechargeCooldown == 0 && player.energy < MaxEnergy {
-				if MaxEnergy-player.energy < 4 {
+			if player.rechargeCooldown == 0 && player.energy < serverConfig.MaxEnergy {
+				if serverConfig.MaxEnergy-player.energy < 4 {
 					player.energy++
 				} else {
 					player.energy += 4
 				}
-				if player == base.owner {
-					player.rechargeCooldown = RechargeCooldownOwn
+				if playerID == base.ownerID {
+					player.rechargeCooldown = serverConfig.RechargeCooldownOwn
 				} else {
-					player.rechargeCooldown = RechargeCooldownOpponent
+					player.rechargeCooldown = serverConfig.RechargeCooldownOpponent
 				}
 			}
-			if player == base.owner && player.repairCooldown == 0 && player.shields < MaxShields {
+			if playerID == base.ownerID && player.repairCooldown == 0 && player.shields < serverConfig.MaxShields {
 				player.shields++
-				player.repairCooldown = RepairCooldown
+				player.repairCooldown = serverConfig.RepairCooldown
 			}
 		}
 	}
 }
 
-func (base *Base) render(camera *sdl.Rect, surface *sdl.Surface) {
+func (base *Base) render(camera *sdl.Rect, surface *sdl.Surface, bases map[uint32]*Base) {
 	base.gameObject.render(camera, surface)
+	if !base.gameObject.inView && !config.Server {
+		delete(bases, base.ownerID)
+	}
 }
 
 func (base *Base) build(gameMap *GameMap) {
@@ -44,10 +50,10 @@ func (base *Base) build(gameMap *GameMap) {
 	if base.gameObject.baseRect.H < 9 {
 		panic("Bad border height")
 	}
-	if gameMap.width-base.gameObject.baseRect.X-base.gameObject.baseRect.W <= 0 {
+	if gameMap.width-uint32(base.gameObject.baseRect.X)-uint32(base.gameObject.baseRect.W) <= 0 {
 		panic("Bad base x location")
 	}
-	if gameMap.height-base.gameObject.baseRect.Y-base.gameObject.baseRect.H <= 0 {
+	if gameMap.height-uint32(base.gameObject.baseRect.Y)-uint32(base.gameObject.baseRect.H) <= 0 {
 		panic("Bad base y location")
 	}
 	if base.gameObject.baseRect.X < 0 || base.gameObject.baseRect.Y < 0 {
@@ -72,41 +78,59 @@ func (base *Base) build(gameMap *GameMap) {
 	}
 }
 
-func createBases(players *[]*Player, gameMap *GameMap) *[]*Base {
-	bases := &[]*Base{}
+func createBase(gameMap *GameMap, baseColor color.Color, posX, posY, ownerID, openingWidth uint32) *Base {
+	gameObject := &GameObject{}
+	gameObject.baseRect = sdl.Rect{
+		X: int32(posX),
+		Y: int32(posY),
+		W: 35,
+		H: 35,
+	}
+	if openingWidth%2 == 0 {
+		openingWidth++
+	}
 
-	for ownerID, player := range *players {
-		gameObject := &GameObject{}
-		gameObject.baseRect = sdl.Rect{
-			X: player.gameObject.baseRect.X - 14,
-			Y: player.gameObject.baseRect.Y - 14,
-			W: 35,
-			H: 35,
-		}
-		openingWidth := int32(float64(player.gameObject.baseRect.W) * 1.5)
-		if openingWidth%2 == 0 {
-			openingWidth++
-		}
+	borderWidth := gameObject.baseRect.W - int32(openingWidth)
+	borderWidthA := borderWidth / 2
+	borderWidthB := borderWidth - borderWidthA + 1
+	if borderWidth < 0 {
+		panic("Bad border width")
+	}
+	gameObject.addColor(baseColor)
+	gameObject.addColoredRect(0, 0, 1, gameObject.baseRect.H, 0)
+	gameObject.addColoredRect(gameObject.baseRect.W, 0, 1, gameObject.baseRect.H, 0)
+	gameObject.addColoredRect(0, 0, borderWidthA, 1, 0)
+	gameObject.addColoredRect(borderWidthA+int32(openingWidth), 0, borderWidthB, 1, 0)
+	gameObject.addColoredRect(0, gameObject.baseRect.H, borderWidthA, 1, 0)
+	gameObject.addColoredRect(borderWidthA+int32(openingWidth), gameObject.baseRect.H, borderWidthB, 1, 0)
+	base := &Base{
+		gameObject:   gameObject,
+		ownerID:      ownerID,
+		openingWidth: int32(openingWidth),
+	}
+	base.build(gameMap)
+	return base
+}
 
-		borderWidth := gameObject.baseRect.W - openingWidth
-		borderWidthA := borderWidth / 2
-		borderWidthB := borderWidth - borderWidthA + 1
-		if borderWidth < 0 {
-			panic("Bad border width")
+func (base *Base) delete(bases map[uint32]*Base) {
+	for x := base.gameObject.baseRect.X; x < base.gameObject.baseRect.X+base.gameObject.baseRect.W+1; x++ {
+		for y := base.gameObject.baseRect.Y; y < base.gameObject.baseRect.Y+base.gameObject.baseRect.H+1; y++ {
+			gameMap.tiles[x][y] = 0
 		}
-		gameObject.addColor((*player).playerColors.body)
-		gameObject.addColoredRect(0, 0, 1, gameObject.baseRect.H, 0)
-		gameObject.addColoredRect(gameObject.baseRect.W, 0, 1, gameObject.baseRect.H, 0)
-		gameObject.addColoredRect(0, 0, borderWidthA, 1, 0)
-		gameObject.addColoredRect(borderWidthA+openingWidth, 0, borderWidthB, 1, 0)
-		gameObject.addColoredRect(0, gameObject.baseRect.H, borderWidthA, 1, 0)
-		gameObject.addColoredRect(borderWidthA+openingWidth, gameObject.baseRect.H, borderWidthB, 1, 0)
-		*bases = append(*bases, &Base{
-			gameObject:   gameObject,
-			owner:        (*players)[ownerID],
-			openingWidth: openingWidth,
-		})
-		(*bases)[ownerID].build(gameMap)
+	}
+	delete(bases, base.ownerID)
+}
+
+func createBases(players map[uint32]*Player, gameMap *GameMap) map[uint32]*Base {
+	bases := map[uint32]*Base{}
+	for ownerID, player := range players {
+		bases[ownerID] = createBase(gameMap,
+			player.playerColors.body,
+			uint32(player.gameObject.baseRect.X-14),
+			uint32(player.gameObject.baseRect.Y-14),
+			ownerID,
+			uint32(float64(player.gameObject.baseRect.W)*1.5),
+		)
 	}
 	return bases
 }