game.go

@@ -19,10 +19,10 @@ func gameinit() {
 	// Quit the screen
 	quit(&game)
 
-	// fmt.Println("\nDebug time: Trash")
+	fmt.Println("\nDebug time: Trash")
-	// for i, t := range game.trash {
+	for i, t := range game.trash {
-	// 	fmt.Println("Trash: ", i, t)
+		fmt.Println("Trash: ", i, t)
-	// }
+	}
 
 	// Give closure
 	if game.gameover == 1 {
@@ -165,7 +165,7 @@ func (game *Game) keyboardProcessor() {
 }
 
 func quit(game *Game) {
-	// game.screen.Clear()
+	game.screen.Clear()
 	maybePanic := recover()
 	game.screen.Fini()
 	if maybePanic != nil {

robots.go

@@ -43,28 +43,21 @@ func (game *Game) moveRobots() {
 	// After all the moves, lets check if any of the rowboz collided with anything
 	for i, r := range game.robots {
 
-		// Hit a player? Game over!
+		// Check if it collides with anything.
 		if game.onPlayer(r) {
 			game.gameover = 1
 			return
 		}
 
-		// Robots mingling? Trash!
+		if game.onRobot(i, r) || game.onTrash(r) {
-		if game.onRobot(i, r) {
 
-			// Delete robot
+			trash := r
+
+			// delete robot
 			game.deleteRobot(i)
 
-			// Create trash
+			// create trash
-			game.addTrash(r)
+			game.addTrash(trash)
-
-		}
-
-		// Hugging Trash? More trash!
-		if game.onTrash(r) {
-
-			// Delete robot
-			game.deleteRobot(i)
 
 		}
 
@@ -72,9 +65,9 @@ func (game *Game) moveRobots() {
 }
 
 func (game *Game) onRobot(index int, pos Position) bool {
-	var found bool = false
+	var found bool
 	for i, r := range game.robots {
-		if index != i && pos == r {
+		if index != i && pos.x == r.x && pos.y == r.y {
 			found = true
 		}
 	}
@@ -84,27 +77,16 @@ func (game *Game) onRobot(index int, pos Position) bool {
 // TODO: improve this
 func (game *Game) deleteRobot(robot int) {
 
-	// The following would work, if it wasn't for the fact you are iterating through an array,
+	var rowboz []Position
-	// and deleting elements form that same array. So deleting item #15 isn't going to work
-	// when the array has been reduced to 13 elements.
-	// if robot < len(game.robots) {
-	// 	game.robots = append(game.robots[:robot], game.robots[robot+1:]...)
-	// }
 
-	// This isn't going to work for the same reason,
+	for i, r := range game.robots {
-	// and it adds the issue that random robots will get deleted.
+		if robot != i {
-	// var rowboz []Position
+			rowboz = append(rowboz, r)
+		}
+	}
 
-	// for i, r := range game.robots {
+	game.robots = nil
-	// 	if robot != i {
+	game.robots = rowboz
-	// 		rowboz = append(rowboz, r)
-	// 	}
-	// }
-
-	// game.robots = nil
-	// game.robots = rowboz
-
-	// Conclusion: I need to find a different way to do this properly while iterating to that same array.
 
 	game.player.score++
 

trash.go

@@ -9,7 +9,7 @@ func (game *Game) drawTrash() {
 func (game *Game) onTrash(pos Position) bool {
 	var found bool
 	for _, t := range game.trash {
-		if t == pos {
+		if t.x == pos.x && t.y == pos.y {
 			found = true
 		}
 	}