From b0c9a5b457c45c7832397219371bc484e4634aae Mon Sep 17 00:00:00 2001 From: xHire Date: Sat, 25 Oct 2008 22:24:05 +0200 Subject: Set the default port in the client to 6800 as well --- src/net/tcp.c | 2 +- src/screen/screen_gameType.c | 2 +- src/server/publicServer.c | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/net/tcp.c b/src/net/tcp.c index 3737b1f..ca11eb3 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -48,7 +48,7 @@ sock_tcp_t *bindTcpSocket(char *address, int port, int proto) assert(port > 0 && port < 65535); new = newSockTcp(proto); - ret = -1; // no Warnnings + ret = -1; // no Warnings assert(new != NULL); diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c index bba8146..0cf8be0 100644 --- a/src/screen/screen_gameType.c +++ b/src/screen/screen_gameType.c @@ -255,7 +255,7 @@ void initScreenGameType() WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN, 300, 180); - textfield_port = newWidgetTextfield(getParamElse("--port", "2200"), + textfield_port = newWidgetTextfield(getParamElse("--port", "6800"), WIDGET_TEXTFIELD_FILTER_NUM, 300, 280); selectSession = newWidgetSelect(300, 185, eventWidget); diff --git a/src/server/publicServer.c b/src/server/publicServer.c index 9aade66..25751e9 100644 --- a/src/server/publicServer.c +++ b/src/server/publicServer.c @@ -161,7 +161,7 @@ static int registerPublicServer() register_head *head = (register_head *) str; head->cmd = 'p'; - head->port = atoi(getSetting("PORT4", "--port4", "2200")); + head->port = atoi(getSetting("PORT4", "--port4", "6800")); head->ip = 0; // TODO /* send request for server list */ @@ -212,8 +212,8 @@ static int initPublicServerNetwork() p_ip6 = NULL; } - port4 = atoi(getSetting("PORT4", "--port4", "2200")); - port6 = atoi(getSetting("PORT6", "--port6", "2200")); + port4 = atoi(getSetting("PORT4", "--port4", "6800")); + port6 = atoi(getSetting("PORT6", "--port6", "6800")); //ret = initNetMulitplayerPublicServer(p_ip4, port4, p_ip6, port6); @@ -252,7 +252,7 @@ int initPublicServer() return -1; } - initHighScore(getSetting("SCORE_FILE", "--score-file", "/tmp/highscore")); + initHighScore(getSetting("SCORE_FILE", "--score-file", "/tmp/highscore.txt")); loadArena(); @@ -269,8 +269,7 @@ int initPublicServer() return -1; } - setServerMaxClients(atoi - (getSetting("MAX_CLIENTS", "--max-clients", "32"))); + setServerMaxClients(atoi (getSetting("MAX_CLIENTS", "--max-clients", "32"))); if (registerPublicServer() < 0) { printf(_("Unable to contact MasterServer!)\n")); -- cgit v1.2.3