seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Seraina
2022-04-30 18:49:08 +02:00
parent 48df7cf950 3e1ab66397
commit c066763f97
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
View File

@@ -345,22 +345,22 @@ public class Client {
}
break;
case GuiParameters.listOfLobbies:
updateListOfLobbies(data);
//updateListOfLobbies(data); (commented out due to compiling error)
//TODO
break;
case GuiParameters.listOfPLayers:
updateListOfClients(data);
//TODO
break;
case GuiParameters.viewChangeToGame:
//case GuiParameters.viewChangeToGame: (commented out due to compiling error)
//TODO
break;
case GuiParameters.viewChangeToStart:
//break; (commented out due to compiling error)
//case GuiParameters.viewChangeToStart: (commented out due to compiling error)
//TODO
break;
case GuiParameters.viewChangeToLobby:
//break; (commented out due to compiling error)
//case GuiParameters.viewChangeToLobby: (commented out due to compiling error)
//TODO
break;
//break; (commented out due to compiling error)
default:
notificationTextDisplay(data);
//TODO(Sebi,Seraina): should the gameController be in the Application just like the ChatController?

2
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
View File

@@ -65,7 +65,7 @@ public class LoungeSceneViewController implements Initializable {
}
public void addLobby(LobbyListItem lobby) {
LobbyTreeView.
//TODO fix/complete following code: LobbyTreeView. (commented out due to compiling error)
}
public void addClientToList(ClientListItem player) {

4
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
View File

@@ -100,7 +100,7 @@ public class JServerProtocolParser {
break;
case Protocol.leaveLobby:
h.leaveLobby();
h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$");
//h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$"); (commented out due to compiling error)
break;
case Protocol.votedFor:
LOGGER.debug("Made it here");
@@ -109,7 +109,7 @@ public class JServerProtocolParser {
break;
case Protocol.startANewGame:
h.startNewGame();
h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$");
//h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$"); (commented out due to compiling error)
break;
case Protocol.listGames:
h.listGames();