From 3f8a672dcfefdd9304ba8b489865cb12153a75e3 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Mon, 8 Mar 2021 01:31:26 +0100 Subject: Make turnInfo generic in its action type --- sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sw-ui/src') diff --git a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt index 81ac14b8..9cda6992 100644 --- a/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt +++ b/sw-ui/src/main/kotlin/org/luxons/sevenwonders/ui/redux/Actions.kt @@ -2,6 +2,7 @@ package org.luxons.sevenwonders.ui.redux import org.luxons.sevenwonders.model.PlayerMove import org.luxons.sevenwonders.model.PlayerTurnInfo +import org.luxons.sevenwonders.model.TurnAction import org.luxons.sevenwonders.model.api.ConnectedPlayer import org.luxons.sevenwonders.model.api.GameListEvent import org.luxons.sevenwonders.model.api.LobbyDTO @@ -20,9 +21,9 @@ data class EnterLobbyAction(val lobby: LobbyDTO) : RAction data class LeaveLobbyAction(val lobbyId: Long) : RAction -data class EnterGameAction(val lobby: LobbyDTO, val turnInfo: PlayerTurnInfo) : RAction +data class EnterGameAction(val lobby: LobbyDTO, val turnInfo: PlayerTurnInfo) : RAction -data class TurnInfoEvent(val turnInfo: PlayerTurnInfo) : RAction +data class TurnInfoEvent(val turnInfo: PlayerTurnInfo<*>) : RAction data class PreparedMoveEvent(val move: PlayerMove) : RAction -- cgit