Changed default port to 6800

Corrected wrong version in server config file
Added missing arena (BAIACO8B) into server list

5 files changed, 16 insertions, 19 deletions

diff --git a/data/conf/arena.conf.in b/data/conf/arena.conf.in
index 65dc35a..cf0aa9c 100644
--- a/data/conf/arena.conf.in
+++ b/data/conf/arena.conf.in
@@ -2,4 +2,5 @@
 @CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/night_workshift.zip NW
 @CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/in_a_captivity_of_8-bit.zip IACO8B
 @CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/construction_site.zip CS
+@CMAKE_INSTALL_DATADIR@/@APPNAME@/arena/ba_in_a_captivity_of_8-bit.zip BAIACO8B
 
diff --git a/data/conf/server.conf b/data/conf/server.conf
index c8aaef2..7da2c3c 100644
--- a/data/conf/server.conf
+++ b/data/conf/server.conf
@@ -3,16 +3,16 @@ NAME		defalt gameserver
 IP4		0.0.0.0
 #IP6		::1
 
-PORT4		2200
-#PORT6		2206
+PORT4		6800
+#PORT6		6806
 
 MAX_CLIENTS	32
 ARENA		BAIACO8B
 
 ITEM		10
-MAX_ITEM	10
+MAX_ITEM	20
 
 LOG_FILE	tuxanci-server.log
-SCORE_FILE	height-score.txt
+SCORE_FILE	highscore.txt
 
-SUPPORT_CLIENTS test 0.20.0 svn
+SUPPORT_CLIENTS test 0.20.0 dev
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index d967413..f59b3b2 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -54,16 +54,14 @@ int initNetMuliplayer(int type, char *ip, int port, int proto)
 		switch (proto) {
 		case PROTO_UDPv4:
 			if (initServer(ip, port, NULL, 0) != 1) {
-				fprintf(stderr,
-						_("Unable to inicialize network game as server!\n"));
+				fprintf(stderr, _("Unable to inicialize network game as server!\n"));
 				netGameType = NET_GAME_TYPE_NONE;
 				return -1;
 			}
 			break;
 		case PROTO_UDPv6:
 			if (initServer(NULL, 0, ip, port) != 1) {
-				fprintf(stderr,
-						_("Unable to inicialize network game as server!\n"));
+				fprintf(stderr, _("Unable to inicialize network game as server!\n"));
 				netGameType = NET_GAME_TYPE_NONE;
 				return -1;
 			}
@@ -74,8 +72,7 @@ int initNetMuliplayer(int type, char *ip, int port, int proto)
 #ifndef PUBLIC_SERVER
 	case NET_GAME_TYPE_CLIENT:
 		if (initClient(ip, port, proto) != 0) {
-			fprintf(stderr,
-					_("Unable to inicialize network game as client!\n"));
+			fprintf(stderr, _("Unable to inicialize network game as client!\n"));
 			netGameType = NET_GAME_TYPE_NONE;
 			return -1;
 		}
diff --git a/src/base/net_multiplayer.h b/src/base/net_multiplayer.h
index f9118b1..0d47e5d 100644
--- a/src/base/net_multiplayer.h
+++ b/src/base/net_multiplayer.h
@@ -11,12 +11,12 @@
 #    define PROTO_UDPv4	0
 #    define PROTO_UDPv6	1
 
-#    define NET_GAME_TYPE_NONE	0
+#    define NET_GAME_TYPE_NONE		0
 #    define NET_GAME_TYPE_SERVER	1
 #    define NET_GAME_TYPE_CLIENT	2
 
 #    define NET_STATUS_OK		0
-#    define NET_STATUS_ZOMBIE	1
+#    define NET_STATUS_ZOMBIE		1
 
 #    define NET_PROTOCOL_TYPE_TCP	0
 #    define NET_PROTOCOL_TYPE_UDP	1
@@ -25,11 +25,10 @@
 
 #    define NET_MASTER_SERVER_DOMAIN	"ms.tuxanci.org"
 #    define NET_MASTER_SERVER		"193.85.244.165"
-#    define NET_MASTER_PORT			2200
+#    define NET_MASTER_PORT		6800
 
 #    ifdef PUBLIC_SERVER
-extern int initNetMuliplayerForGameServer(char *ip4, int port4, char *ip6,
-										  int port6);
+extern int initNetMuliplayerForGameServer(char *ip4, int port4, char *ip6, int port6);
 #    endif
 
 extern int initNetMuliplayer(int type, char *ip, int port, int proto);
diff --git a/src/downserver/downServer.c b/src/downserver/downServer.c
index e783f06..52e757d 100644
--- a/src/downserver/downServer.c
+++ b/src/downserver/downServer.c
@@ -20,7 +20,7 @@
 
 #define STR_PATH_SIZE			4096
 #define STR_ARENA_NET_NAME_SIZE		256
-#define BUFFER_SEND_FILE_SIZE 4096
+#define BUFFER_SEND_FILE_SIZE		4096
 
 #define NET_STATUS_OK		0
 #define NET_STATUS_ZOMBIE	1
@@ -118,7 +118,7 @@ static void proto_getarena(client_t * client, char *msg)
 		if (client->file == NULL || client->fileSize < 0) {
 			client->file = NULL;
 			client->fileSize = 0;
-			sprintf(msg_out, "ERR server has a problem !\n");
+			sprintf(msg_out, "ERR server has a problem!\n");
 		} else {
 			sprintf(msg_out, "OK %d\n", client->fileSize);
 		}
@@ -335,7 +335,7 @@ int main(int argc, char **argv)
 {
 	signal(SIGPIPE, SIG_IGN);
 
-	initDownServer("127.0.0.1", 2200);
+	initDownServer("0.0.0.0", 6800);
 
 	while (1) {
 		startDownServer();