merge dev int test #29

Merged
j23f0712 merged 4 commits from development into dev/test 2024-12-01 23:33:43 +01:00
2 changed files with 42 additions and 1 deletions
Showing only changes of commit 23aa2db714 - Show all commits

View File

@@ -60,6 +60,8 @@ private void handleLobby(Notification notification) {
if (notification instanceof TskSelectNotification n) {
lobbyView.setTaken(n.getColor(), true, n.isSelf(), n.getName());
lobbyView.setTaken(n.getColor(), true, false, n.getName());
} else if (notification instanceof StartDialogNotification) {
app.enter(MdgaState.MAIN);
} else if (notification instanceof TskUnselectNotification n) {
lobbyView.setTaken(n.getColor(), false, false, null);
} else if(notification instanceof LobbyReadyNotification lobbyReadyNotification) {

View File

@@ -12,6 +12,7 @@
import pp.mdga.message.server.UpdateReadyMessage;
import pp.mdga.message.server.UpdateTSKMessage;
import pp.mdga.notification.LobbyReadyNotification;
import pp.mdga.notification.StartDialogNotification;
import pp.mdga.notification.TskSelectNotification;
import pp.mdga.notification.TskUnselectNotification;
@@ -36,6 +37,7 @@ public void exit() {
@Override
public void selectLeave() {
parent.setState(parent.getStartDialog());
logic.addNotification(new StartDialogNotification());
logic.send(new LeaveGameMessage());
}
@@ -72,6 +74,7 @@ public void selectStart(){
@Override
public void received(ServerStartGameMessage msg){
parent.startGame();
}