summaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorxHire <xhire@tuxportal.cz>2008-10-25 19:33:37 +0200
committerxHire <xhire@tuxportal.cz>2008-10-25 19:33:37 +0200
commit39f3432e4e1e8a2b6c3234df6b90d35e03548b48 (patch)
tree51520f470d710fcc6aa746a70fc0e9f24fbf48b9 /src/base
parentc8a9209d77a896bf49227e5aeccd54e91ccf29cc (diff)
Changed default port to 6800
Corrected wrong version in server config file Added missing arena (BAIACO8B) into server list
Diffstat (limited to 'src/base')
-rw-r--r--src/base/net_multiplayer.c9
-rw-r--r--src/base/net_multiplayer.h9
2 files changed, 7 insertions, 11 deletions
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);