diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Makefile-publicServer | 4 | ||||
| -rw-r--r-- | src/main.c | 3 | ||||
| -rw-r--r-- | src/net_multiplayer.c | 4 | ||||
| -rw-r--r-- | src/pipe.c | 3 | ||||
| -rw-r--r-- | src/proto.c | 2 | ||||
| -rw-r--r-- | src/publicServer.c | 4 | ||||
| -rw-r--r-- | src/server.c | 4 | ||||
| -rw-r--r-- | src/shot.c | 1 | ||||
| -rw-r--r-- | src/teleport.c | 1 |
9 files changed, 19 insertions, 7 deletions
diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer index 243399f..4d9df5e 100755 --- a/src/Makefile-publicServer +++ b/src/Makefile-publicServer @@ -4,13 +4,13 @@ CC = gcc DISTDIR:=/usr/ -CFLAGS = -g -O0 -DBUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall +CFLAGS = -g -O0 -DBUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -DDISTDIR=\"$(DISTDIR)\" -I../include -Wall #CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall LIBS = FILES = list.o director.o configFile.o tux.o main.o wall.o shot.o myTimer.o \ - buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o tcp.o\ + buffer.o dynamicInt.o arena.o arenaFile.o textFile.o gun.o item.o teleport.o pipe.o\ udp.o proto.o server.o publicServer.o net_multiplayer.o publicserver: $(FILES) @@ -1,5 +1,8 @@ #include <time.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include "main.h" #include "tux.h" diff --git a/src/net_multiplayer.c b/src/net_multiplayer.c index 4da5b87..5a99bfe 100644 --- a/src/net_multiplayer.c +++ b/src/net_multiplayer.c @@ -13,11 +13,11 @@ #include "arenaFile.h" #include "net_multiplayer.h" #include "server.h" -#include "tcp.h" #include "udp.h" -#include "sdl_udp.h" #ifndef BUBLIC_SERVER +#include "sdl_udp.h" +#include "tcp.h" #include "screen.h" #include "screen_setting.h" #include "screen_choiceArena.h" @@ -1,14 +1,15 @@ #include <stdlib.h> +#include <stdio.h> #include <assert.h> #include "main.h" #include "pipe.h" -#include "layer.h" #include "shot.h" #ifndef BUBLIC_SERVER #include "screen_world.h" +#include "layer.h" #endif #ifdef BUBLIC_SERVER diff --git a/src/proto.c b/src/proto.c index a852eb9..0af969f 100644 --- a/src/proto.c +++ b/src/proto.c @@ -1,5 +1,7 @@ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <assert.h> #include "main.h" diff --git a/src/publicServer.c b/src/publicServer.c index 952628c..1108a20 100644 --- a/src/publicServer.c +++ b/src/publicServer.c @@ -1,5 +1,7 @@ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <assert.h> #include "main.h" @@ -90,7 +92,7 @@ void eventPublicServer() eventNetMultiplayer(); - if( time == 0 ) + if( lastActive == 0 ) { lastActive = getMyTime(); } diff --git a/src/server.c b/src/server.c index 2e3e141..5e4d40b 100644 --- a/src/server.c +++ b/src/server.c @@ -1,4 +1,8 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include "list.h" #include "tux.h" #include "network.h" @@ -1,5 +1,6 @@ #include <stdlib.h> +#include <string.h> #include <assert.h> #include "main.h" diff --git a/src/teleport.c b/src/teleport.c index 776d7c7..05cacd9 100644 --- a/src/teleport.c +++ b/src/teleport.c @@ -6,7 +6,6 @@ #include "tux.h" #include "teleport.h" #include "shot.h" -#include "sound.h" #ifndef BUBLIC_SERVER #include "layer.h" |