Limiting the amount of bombs functionality added

bomb.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"sync"
 	"time"
 
 	tcell "github.com/gdamore/tcell/v2"
@@ -101,14 +102,11 @@ func calculateFinalPosition(maxX, maxY, currentX, currentY, distanceX, distanceY
 	}
 }
 
-func (b *Bomb) draw(s tcell.Screen, style tcell.Style) {
-	ticker := time.NewTicker(20 * time.Millisecond)
-	bombExploded := make(chan struct{})
-	explosionComplete := make(chan struct{})
+func (b *Bomb) draw(s tcell.Screen, style tcell.Style, ticker *time.Ticker, bombExploded chan string, explosionComplete chan struct{}, explosionWaitGroup *sync.WaitGroup) {
 	go func() {
 		time.Sleep(b.explodeIn)
-		b.isDead = true
-		close(bombExploded)
+		bombExploded <- ""
+		bombExploded <- ""
 		time.Sleep(1 * time.Second)
 		close(explosionComplete)
 	}()
@@ -134,6 +132,8 @@ func (b *Bomb) draw(s tcell.Screen, style tcell.Style) {
 				s.SetContent(b.currentX, b.currentY, ExplosionEmoji, nil, style)
 				b.lastDrawnPosition.x = b.currentX
 				b.lastDrawnPosition.y = b.currentY
+				explosionWaitGroup.Done()
+				explosionWaitGroup.Wait()
 			case <-explosionComplete:
 				s.SetContent(b.currentX, b.currentY, ' ', nil, style)
 				s.Show()

hero.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"sync"
 	"time"
 
 	tcell "github.com/gdamore/tcell/v2"
@@ -69,6 +70,42 @@ func (h *Hero) addBomb(s tcell.Screen, style tcell.Style, clickedX, clickedY int
 
 	h.bombIdCounter++
 	h.bombs = append(h.bombs, bomb)
-	bomb.draw(s, style)
+
+	ticker := time.NewTicker(20 * time.Millisecond)
+	bombExploded := make(chan string)
+	explosionComplete := make(chan struct{})
+
+	var explosionWaitGroup sync.WaitGroup
+	explosionWaitGroup.Add(2)
+
+	bomb.draw(s, style, ticker, bombExploded, explosionComplete, &explosionWaitGroup)
+
+	// TODO: use the waitGroups to be sure that each goroutine are not leaking
+
+	go func() {
+		for {
+			select {
+			case <-bombExploded:
+
+				var indexToRemove int = -1
+
+				for i, heroBomb := range h.bombs {
+					if heroBomb.bombId == bomb.bombId {
+						bomb.isDead = true
+						indexToRemove = i
+						break
+					}
+				}
+
+				if indexToRemove != -1 {
+					// Create a new slice without the element to remove
+					h.bombs = append(h.bombs[:indexToRemove], h.bombs[indexToRemove+1:]...)
+				}
+
+				explosionWaitGroup.Done()
+				explosionWaitGroup.Wait()
+			}
+		}
+	}()
 
 }