summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/bool.h2
-rwxr-xr-xinclude/buffer.h2
-rw-r--r--include/client.h2
-rw-r--r--include/configFile.h1
-rw-r--r--include/director.h1
-rw-r--r--include/dynamicInt.h2
-rw-r--r--include/gun.h2
-rwxr-xr-xinclude/homeDirector.h2
-rwxr-xr-xinclude/interface.h2
-rwxr-xr-xinclude/list.h2
-rw-r--r--include/logFile.h2
-rw-r--r--include/main.h1
-rw-r--r--include/net_multiplayer.h1
-rwxr-xr-xinclude/network.h2
-rw-r--r--include/path.h15
-rw-r--r--include/proto.h1
-rw-r--r--include/screen_choiceArena.h2
-rw-r--r--include/string_length.h2
-rw-r--r--include/udp.h2
-rw-r--r--include/wall.h2
-rw-r--r--include/widget_button.h2
-rw-r--r--include/widget_buttonimage.h2
-rw-r--r--include/widget_image.h1
23 files changed, 52 insertions, 1 deletions
diff --git a/include/bool.h b/include/bool.h
index ea32909..d122b85 100644
--- a/include/bool.h
+++ b/include/bool.h
@@ -3,6 +3,8 @@
#define BOOL_H
+#include "main.h"
+
#define bool_t int
#define TRUE 1
diff --git a/include/buffer.h b/include/buffer.h
index 1b338df..b547e2b 100755
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -3,6 +3,8 @@
#define BUFFER_H
+#include "main.h"
+
#define BUFFER_LIMIT_ALLOC 1024
typedef struct str_buffer
diff --git a/include/client.h b/include/client.h
index 6c827f7..aee5e81 100644
--- a/include/client.h
+++ b/include/client.h
@@ -3,6 +3,8 @@
#define MY_CLIENT
+#include "main.h"
+
#if defined SUPPORT_NET_UNIX_UDP || defined SUPPORT_NET_SDL_UDP
#define CLIENT_TIMEOUT 2500
diff --git a/include/configFile.h b/include/configFile.h
index a57fb16..f68a381 100644
--- a/include/configFile.h
+++ b/include/configFile.h
@@ -3,6 +3,7 @@
#define CONFIGFILE_H
+#include "main.h"
#include "textFile.h"
extern int isYesOrNO(char *s);
diff --git a/include/director.h b/include/director.h
index aa2b2fd..8a07ed0 100644
--- a/include/director.h
+++ b/include/director.h
@@ -3,6 +3,7 @@
#define DIRECTOR_H
+#include "main.h"
#include "list.h"
typedef struct director_struct
diff --git a/include/dynamicInt.h b/include/dynamicInt.h
index fbc54a7..266ff86 100644
--- a/include/dynamicInt.h
+++ b/include/dynamicInt.h
@@ -3,6 +3,8 @@
#define DYNAMIC_INT_H
+#include "main.h"
+
extern int* newInt(int x);
#endif
diff --git a/include/gun.h b/include/gun.h
index 57c2378..5f443e6 100644
--- a/include/gun.h
+++ b/include/gun.h
@@ -3,6 +3,8 @@
#define GUN_H
+#include "main.h"
+
#define GUN_SHOT_WIDTH 5
#define GUN_SHOT_HEIGHT 5
diff --git a/include/homeDirector.h b/include/homeDirector.h
index 6dbf5a2..85f8172 100755
--- a/include/homeDirector.h
+++ b/include/homeDirector.h
@@ -3,6 +3,8 @@
#define HOMEDIRECTOR_H
+#include "main.h"
+
#define HOMEDIRECTOR_NAME ".tuxanci-ng"
extern void createHomeDirector();
diff --git a/include/interface.h b/include/interface.h
index a65ffa4..77f515b 100755
--- a/include/interface.h
+++ b/include/interface.h
@@ -19,7 +19,7 @@
#define SDL_SUBSYSTEMS SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_DOUBLEBUF
//napis na okne
-#define WINDOW_TITLE "Tuxanci next generation SVN revision 23"
+#define WINDOW_TITLE "Tuxanci next generation SVN revision 24"
#define WIN_BPP 0
#define USR_EVT_TIMER 0
diff --git a/include/list.h b/include/list.h
index 0e122c6..8722baa 100755
--- a/include/list.h
+++ b/include/list.h
@@ -3,6 +3,8 @@
#define LIST_H
+#include "main.h"
+
#define LIST_ALLOC_LIMIT 16
typedef struct list_str
diff --git a/include/logFile.h b/include/logFile.h
index 639069d..12f5606 100644
--- a/include/logFile.h
+++ b/include/logFile.h
@@ -3,6 +3,8 @@
#define LOGFILE_H
+#include "main.h"
+
typedef struct logFile_struct
{
char *name;
diff --git a/include/main.h b/include/main.h
index a51fd1e..da5b7ca 100644
--- a/include/main.h
+++ b/include/main.h
@@ -3,6 +3,7 @@
#define MAIN_H
+#include "../config.h"
#include "bool.h"
#include "string_length.h"
#include "path.h"
diff --git a/include/net_multiplayer.h b/include/net_multiplayer.h
index 723545f..0127de8 100644
--- a/include/net_multiplayer.h
+++ b/include/net_multiplayer.h
@@ -3,6 +3,7 @@
#define NET_MULTIPLAYER_H
+#include "main.h"
#include "tux.h"
#include "item.h"
#include "buffer.h"
diff --git a/include/network.h b/include/network.h
index dde6d25..a7934eb 100755
--- a/include/network.h
+++ b/include/network.h
@@ -1,6 +1,8 @@
#ifndef NETWORK_H
+#include "main.h"
+
#define NETWORK_H
extern int newSocket(int port,const char *ip);
diff --git a/include/path.h b/include/path.h
index ab1ae61..a51baa0 100644
--- a/include/path.h
+++ b/include/path.h
@@ -3,8 +3,23 @@
#define PATH_H
+#include "main.h"
+
+#ifdef DISTDIR
+
#define PATH_DIR "share/tuxanci-ng/"
+#endif
+
+#ifndef DISTDIR
+
+#define PATH_DIR "./"
+
+#undef DISTDIR
+#define DISTDIR ""
+
+#endif
+
#define PATH_IMAGE DISTDIR PATH_DIR "image/"
#define PATH_FONT DISTDIR PATH_DIR "font/"
#define PATH_ARENA DISTDIR PATH_DIR "arena/"
diff --git a/include/proto.h b/include/proto.h
index 5e50965..e94c086 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -3,6 +3,7 @@
#define MY_PROTO
+#include "main.h"
#include "tux.h"
#include "server.h"
#include "item.h"
diff --git a/include/screen_choiceArena.h b/include/screen_choiceArena.h
index 0b10006..e6eebc4 100644
--- a/include/screen_choiceArena.h
+++ b/include/screen_choiceArena.h
@@ -3,6 +3,8 @@
#define SCREEN_GAME_TYPE
+#include "main.h"
+
#define SCREENSHOT_ARENA_WIDTH 160
#define SCREENSHOT_ARENA_HEIGHT 107
diff --git a/include/string_length.h b/include/string_length.h
index 693af5b..7f1c8a7 100644
--- a/include/string_length.h
+++ b/include/string_length.h
@@ -3,6 +3,8 @@
#define STR_LENGTH_H
+#include "main.h"
+
#define STR_SIZE 128
#define STR_NUM_SIZE 8
#define STR_NAME_SIZE 32
diff --git a/include/udp.h b/include/udp.h
index 8c63e10..9d7be85 100644
--- a/include/udp.h
+++ b/include/udp.h
@@ -5,6 +5,8 @@
#define MY_UDP
+#include "main.h"
+
typedef struct struct_sock_udp_t
{
int sock;
diff --git a/include/wall.h b/include/wall.h
index c9b74f0..329063d 100644
--- a/include/wall.h
+++ b/include/wall.h
@@ -3,6 +3,8 @@
#define WALL_H
+#include "main.h"
+
#ifndef BUBLIC_SERVER
#include "interface.h"
#endif
diff --git a/include/widget_button.h b/include/widget_button.h
index 0787878..5090e55 100644
--- a/include/widget_button.h
+++ b/include/widget_button.h
@@ -3,6 +3,8 @@
#define WIDGET_BUTTON_H
+#include "main.h"
+
#define WIDGET_BUTTON_TIME 10
#define WIDGET_BUTTON_WIDTH 125
diff --git a/include/widget_buttonimage.h b/include/widget_buttonimage.h
index 8b279ce..d03423e 100644
--- a/include/widget_buttonimage.h
+++ b/include/widget_buttonimage.h
@@ -1,6 +1,8 @@
#ifndef WIDGET_BUTTONIMAGE_H
+#include "main.h"
+
#define WIDGET_BUTTONIMAGE_H
#define WIDGET_BUTTONIMAGE_TIME 10
diff --git a/include/widget_image.h b/include/widget_image.h
index 30516f2..6bb316c 100644
--- a/include/widget_image.h
+++ b/include/widget_image.h
@@ -3,6 +3,7 @@
#define WIDGET_IMAGE_H
+#include "main.h"
#include "interface.h"
typedef struct widget_image