- dopisane scripty

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

15 files changed, 17 insertions, 4 deletions

diff --git a/src/Makefile b/src/Makefile
index 67e442b..b740d40 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,7 +2,8 @@
 #CC = /usr/local/gcc/bin/gcc
 CC = gcc
 
-CFLAGS = -g -O0 -DSUPPORT_NET_SDL_UDP -DDISTDIR=\"$(DISTDIR)\" -I../include -Wall `sdl-config --cflags`
+#CFLAGS = -O2 -DSUPPORT_NET_SDL_UDP  -I../include -Wall `sdl-config --cflags`
+CFLAGS = -O2  -I../include -Wall `sdl-config --cflags`
 #CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall
 
 LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net
diff --git a/src/arena.c b/src/arena.c
index 52044d1..c2080f9 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <string.h>
 
+#include "main.h"
 #include "arena.h"
 #include "list.h"
 #include "tux.h"
diff --git a/src/buffer.c b/src/buffer.c
index 95fef9d..37cbdfc 100755
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "main.h"
 #include "buffer.h"
 
 buffer_t * newBuffer(int n)
diff --git a/src/client.c b/src/client.c
index 9dfeda5..12c9c0f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "main.h"
 #include "list.h"
 #include "tux.h"
 #include "network.h"
diff --git a/src/director.c b/src/director.c
index e0b16b9..6d2fe8c 100755
--- a/src/director.c
+++ b/src/director.c
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <assert.h>
 
+#include "main.h"
 #include "list.h"
 #include "string_length.h"
 
@@ -42,7 +43,6 @@ director_t* loadDirector(char *s)
 	}
 
 	new->path = strdup(path);
-	printf("new->path = %s\n", new->path);
 
 	dir = opendir(new->path);
 
diff --git a/src/dynamicInt.c b/src/dynamicInt.c
index 3845d2f..4dd32ce 100644
--- a/src/dynamicInt.c
+++ b/src/dynamicInt.c
@@ -1,5 +1,6 @@
 
 #include <stdlib.h>
+#include "main.h"
 #include "dynamicInt.h"
 
 int* newInt(int x)
diff --git a/src/gun.c b/src/gun.c
index 08c3285..61ece2b 100644
--- a/src/gun.c
+++ b/src/gun.c
@@ -3,12 +3,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "main.h"
 #include "arena.h"
 #include "tux.h"
 #include "shot.h"
 #include "dynamicInt.h"
 #include "myTimer.h"
-#include "main.h"
 #include "item.h"
 #include "gun.h"
 
diff --git a/src/list.c b/src/list.c
index 64dae27..56f7e17 100755
--- a/src/list.c
+++ b/src/list.c
@@ -1,4 +1,5 @@
 
+#include "main.h"
 #include "list.h"
 
 #include <stdio.h>
diff --git a/src/logFile.c b/src/logFile.c
index 12a4df8..7ff58c7 100644
--- a/src/logFile.c
+++ b/src/logFile.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <assert.h>
+#include "main.h"
 
 typedef struct logFile_struct
 {
diff --git a/src/net_multiplayer.c b/src/net_multiplayer.c
index 5a99bfe..9daf943 100644
--- a/src/net_multiplayer.c
+++ b/src/net_multiplayer.c
@@ -5,6 +5,7 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include "main.h"
 #include "list.h"
 #include "tux.h"
 #include "item.h"
diff --git a/src/screen_credits.c b/src/screen_credits.c
index 17c1bfe..7cd44ea 100644
--- a/src/screen_credits.c
+++ b/src/screen_credits.c
@@ -93,7 +93,7 @@ void initScreenCredits()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton("Back", WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, WINDOW_SIZE_Y-100, eventWidget);
+	button_back = newWidgetButton("Back", WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, WINDOW_SIZE_Y-80, eventWidget);
 
 	listWidgetLabel = newList();
 	textFile = loadTextFile(PATH_DATA SCREEN_CREDITS_FILE);
diff --git a/src/sdl_udp.c b/src/sdl_udp.c
index a8eae7a..e6b669a 100644
--- a/src/sdl_udp.c
+++ b/src/sdl_udp.c
@@ -5,6 +5,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
+
+#include "main.h"
 #include "sdl_udp.h"
 
 #define BUFSIZE 1000
diff --git a/src/server.c b/src/server.c
index 2a259c5..d55a6c0 100644
--- a/src/server.c
+++ b/src/server.c
@@ -9,6 +9,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
+#include "main.h"
 #include "list.h"
 #include "tux.h"
 #include "network.h"
diff --git a/src/tcp.c b/src/tcp.c
index 87b548b..a80eca8 100755
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -11,6 +11,7 @@
 #include <unistd.h>
 #include <assert.h>
 
+#include "main.h"
 #include "tcp.h"
 
 #define BUFSIZE 1000
diff --git a/src/textFile.c b/src/textFile.c
index e55650e..b3c0156 100755
--- a/src/textFile.c
+++ b/src/textFile.c
@@ -6,6 +6,7 @@
 #include <assert.h>
 #include <unistd.h>
 
+#include "main.h"
 #include "textFile.h"
 #include "string_length.h"