michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 22:38:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merging game lobby with game state broadcast. Merge conflicts resolved.

Browse Source 
Port numbers updated to 4942.
This commit is contained in:
Kusal Ekanayake
2017-07-24 15:26:51 +12:00
parent 1daac842f2
commit 526c12127f
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/StartScreenController.java
+2 -1
View File
@@ -75,7 +75,8 @@ public class StartScreenController {
new MainServerThread();
ClientState.setHost(true);
// host will connect and handshake to itself after setting up the server
ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4950);
// TODO: 24/07/17 wmu16 - Make port number some static global type constant?
ClientToServerThread clientToServerThread = new ClientToServerThread(ClientState.getHostIp(), 4942);
ClientState.setConnectedToHost(true);
controller.setClientToServerThread(clientToServerThread);
setContentPane("/views/LobbyView.fxml");