diff options
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | include/udp.h | 2 | ||||
| -rwxr-xr-x | modules/Makefile-publicserver | 2 | ||||
| -rw-r--r-- | src/client.c | 8 | ||||
| -rw-r--r-- | src/server.c | 6 | ||||
| -rw-r--r-- | src/tux.c | 3 | ||||
| -rw-r--r-- | src/udp.c | 3 |
7 files changed, 21 insertions, 5 deletions
@@ -6,7 +6,7 @@ #define DEBUG_CLIENT_RECV */ -#define TUXANCI_NG_VERSION "svn72" +#define TUXANCI_NG_VERSION "svn73" #define DESTDIR "/usr/local/" #define SUPPORT_NET_UNIX_UDP diff --git a/include/udp.h b/include/udp.h index 29f383b..2b591c3 100644 --- a/include/udp.h +++ b/include/udp.h @@ -15,7 +15,9 @@ typedef struct struct_sock_udp_t int sock; int proto; +#ifdef SUPPORT_IPv6 struct sockaddr_in6 sockAddr6; +#endif struct sockaddr_in sockAddr; } sock_udp_t; diff --git a/modules/Makefile-publicserver b/modules/Makefile-publicserver index 6766ae8..030361c 100755 --- a/modules/Makefile-publicserver +++ b/modules/Makefile-publicserver @@ -15,7 +15,7 @@ modPipe: modWall: gcc $(CFLAGS) -fPIC -I../include -c list.c -o list.o - gcc $(CFLAGS) -fPIC -I../include `sdl-config --cflags` -c space.c -o space.o + gcc $(CFLAGS) -fPIC -I../include -c space.c -o space.o gcc $(CFLAGS) -fPIC -I../include -c modWall.c -o modWall.o gcc $(CFLAGS) -I../include -shared -fPIC -o modWall.so modWall.o list.o space.o diff --git a/src/client.c b/src/client.c index 912b1b0..f49fefb 100644 --- a/src/client.c +++ b/src/client.c @@ -1,7 +1,15 @@ + #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/socket.h> +#include <sys/select.h> + #include "main.h" #include "list.h" #include "tux.h" diff --git a/src/server.c b/src/server.c index 2480f4b..a85e9c3 100644 --- a/src/server.c +++ b/src/server.c @@ -1,11 +1,15 @@ + #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/select.h> + #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> -#include <sys/types.h> #include <sys/time.h> #include "main.h" @@ -382,7 +382,8 @@ void tuxTeleport(tux_t *tux) if( getNetTypeGame() != NET_GAME_TYPE_CLIENT ) { findFreeSpace(getCurrentArena(), &x, &y, TUX_WIDTH, TUX_HEIGHT); - setTuxProportion(tux, x, y); + moveObjectInSpace(getCurrentArena()->spaceTux, tux, x, y); + //setTuxProportion(tux, x, y); } if( getNetTypeGame() == NET_GAME_TYPE_SERVER ) @@ -4,6 +4,7 @@ #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> +#include <netdb.h> #include <unistd.h> #include <stdlib.h> #include <string.h> @@ -11,7 +12,7 @@ #include <netdb.h> #include <string.h> #include <assert.h> -#include <netdb.h> + #define BUFSIZE 1000 #include "udp.h" |