- oprava problemu s pozostatkom sdl v publicserveri

git-svn-id: http://opensvn.csie.org/tuxanci_ng@22 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

15 files changed, 32 insertions, 8 deletions

diff --git a/include/arena.h b/include/arena.h
index 8ac353d..c5f34b4 100644
--- a/include/arena.h
+++ b/include/arena.h
@@ -4,7 +4,9 @@
 #define ARENA_H
 
 #include "main.h"
+#ifndef BUBLIC_SERVER
 #include "interface.h"
+#endif
 #include "list.h"
 
 typedef struct arena_struct
diff --git a/include/item.h b/include/item.h
index fd66839..fdc6cd5 100644
--- a/include/item.h
+++ b/include/item.h
@@ -4,7 +4,9 @@
 #define ITEM_H
 
 #include "main.h"
+#ifndef BUBLIC_SERVER
 #include "interface.h"
+#endif
 #include "list.h"
 #include "tux.h"
 
diff --git a/include/pipe.h b/include/pipe.h
index 7f38fb8..867dcc8 100644
--- a/include/pipe.h
+++ b/include/pipe.h
@@ -4,7 +4,9 @@
 #define PIPE_H
 
 #include "main.h"
+#ifndef BUBLIC_SERVER
 #include "interface.h"
+#endif
 #include "list.h"
 
 typedef struct pipe_struct
diff --git a/include/shot.h b/include/shot.h
index 3bd0142..22fb2f5 100644
--- a/include/shot.h
+++ b/include/shot.h
@@ -2,7 +2,9 @@
 #ifndef SHOT_H
 
 #include "main.h"
+#ifndef BUBLIC_SERVER	
 #include "interface.h"
+#endif	
 #include "list.h"
 #include "tux.h"
 
diff --git a/include/teleport.h b/include/teleport.h
index 7eba1ce..fc039c0 100644
--- a/include/teleport.h
+++ b/include/teleport.h
@@ -3,10 +3,11 @@
 
 #define TELEPORT_H
 
+#ifndef BUBLIC_SERVER
 #include "interface.h"
+#endif
 #include "main.h"
 #include "list.h"
-#include "interface.h"
 
 typedef struct teleport_struct
 {
diff --git a/include/wall.h b/include/wall.h
index e22bf34..c9b74f0 100644
--- a/include/wall.h
+++ b/include/wall.h
@@ -3,7 +3,10 @@
 
 #define WALL_H
 
+#ifndef BUBLIC_SERVER
 #include "interface.h"
+#endif
+
 #include "list.h"
 
 typedef struct wall_struct
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)
diff --git a/src/main.c b/src/main.c
index e1a9285..c53c3fe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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"
diff --git a/src/pipe.c b/src/pipe.c
index 3b41fd0..5a435e4 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -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"
diff --git a/src/shot.c b/src/shot.c
index a68527e..b8bec35 100644
--- a/src/shot.c
+++ b/src/shot.c
@@ -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"