intermediate commit

* use names for pile perm choice
* fix PocList hover segfault
* prevent mysterius autogenerated playTargets segfault

3 files changed, 10 insertions, 4 deletions

diff --git a/go/client/game.go b/go/client/game.go
index bbfb6643..0e516815 100644
--- a/go/client/game.go
+++ b/go/client/game.go
@@ -206,9 +206,11 @@ func (g *Game) addPermActionChoice(perm game.Permanent, x, y int) {
 	}
 
 	perms := []game.Permanent{perm}
+	labels := []string{perm.Card().Name}
 	for _, p := range perm.Pile() {
 		if len(p.CurrentlyAvailActions()) > 0 {
 			perms = append(perms, p)
+			labels = append(labels, p.Card().Name)
 		}
 	}
 
@@ -219,7 +221,7 @@ func (g *Game) addPermActionChoice(perm game.Permanent, x, y int) {
 			p := perms[c.GetChoosen(x, y)]
 			g.addActionChoice(p, x, y)
 		}
-		g.addChoice(ui.NewPermChoice(x, y, perms, onClick))
+		g.addChoice(ui.NewChoice(x, y, utils.TypedSliceToInterfaceSlice(labels), onClick))
 	} else {
 		g.selectedObject = perms[0]
 		g.addActionChoice(perms[0], x, y)
diff --git a/go/game/cardImplementations.go b/go/game/cardImplementations.go
index 52ffee98..66c77b18 100644
--- a/go/game/cardImplementations.go
+++ b/go/game/cardImplementations.go
@@ -522,7 +522,7 @@ func (i *frostPylonImpl) onLeaving(t *Tile) {
 	}
 }
 
-type giganticHailImpl struct{
+type giganticHailImpl struct {
 	cardImplementation
 }
 
@@ -586,6 +586,8 @@ func (*tentacleSlapImpl) onPlay(s *State, _ *Card, kraken *Player, _ *Targets) {
 
 type unholyCannonballImpl struct{ cardImplementation }
 
+func (*unholyCannonballImpl) playTargets() TargetDesc { return INVALID_TARGET_DESC }
+
 func (*unholyCannonballImpl) onPlay(s *State, _ *Card, kraken *Player, _ *Targets) {
 	krakenTiles := s.Map.FilterTiles(func(t *Tile) bool { return t.Raw == "the kraken" })
 	if len(krakenTiles) != 1 {
diff --git a/go/ui/hoverable.go b/go/ui/hoverable.go
index 54d4ec15..30415c8d 100644
--- a/go/ui/hoverable.go
+++ b/go/ui/hoverable.go
@@ -62,11 +62,13 @@ type hoverCardView struct {
 
 func (h *hoverCardView) init(w Widget) {
 	h.createHint = func(x, y int) Widget {
-		card := w.FindObjectAt(x, y).(*game.Card)
-		if card == nil {
+		obj := w.FindObjectAt(x, y)
+		if obj == nil {
 			return nil
 		}
 
+		card := obj.(*game.Card)
+
 		wx, wy := x, y
 		if x+HOVER_CARD_WIDTH > h.xMax || y+HOVER_CARD_HEIGHT > h.yMax {
 			wx = x - HOVER_CARD_WIDTH