1
0

Ability to set server IP for client connection

This commit is contained in:
Victor 2014-03-23 23:39:26 +02:00
parent cfbbbde701
commit 34f0c85e6f
2 changed files with 7 additions and 1 deletions

View File

@ -52,6 +52,10 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
gameStarted = false; gameStarted = false;
} }
public void setServerAddress(String inetAddress) {
this.inetAddress = inetAddress;
}
@Override @Override
protected void draw(Graphics2D g) { protected void draw(Graphics2D g) {
final FontMetrics metrics = g.getFontMetrics(font); final FontMetrics metrics = g.getFontMetrics(font);
@ -130,7 +134,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
GameServer server = new GameServer(this); GameServer server = new GameServer(this);
socketHelper = server.getHelper(); socketHelper = server.getHelper();
} else { } else {
GameClient client = new GameClient("localhost", this); GameClient client = new GameClient(inetAddress, this);
socketHelper = client.getHelper(); socketHelper = client.getHelper();
} }
socketHelper.start(); socketHelper.start();

View File

@ -1,6 +1,7 @@
package com.annimon.turrets; package com.annimon.turrets;
import static com.annimon.turrets.Constants.SCREEN_DIMENSION; import static com.annimon.turrets.Constants.SCREEN_DIMENSION;
import com.annimon.turrets.util.Prefs;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;
@ -76,6 +77,7 @@ public class MenuPanel extends JPanel {
case 1: // Join client case 1: // Join client
menuList.removeSelectionInterval(0, 1); menuList.removeSelectionInterval(0, 1);
GameCanvas canvas = new GameCanvas(index == 0); GameCanvas canvas = new GameCanvas(index == 0);
canvas.setServerAddress(Prefs.getInstance().lastIp());
Main.getInstance().switchLayout(canvas); Main.getInstance().switchLayout(canvas);
new Thread(canvas).start(); new Thread(canvas).start();
break; break;