- PREFIX can be changed through a compilation option now

- AI check_box relocated in Settings
- fixed couple of compilation warnings


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

4 files changed, 22 insertions, 15 deletions

diff --git a/src/base/main.h b/src/base/main.h
index a8e5503..b8f988b 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -9,7 +9,7 @@
 #include "string_length.h"
 #include "path.h"
 
-//rozlisenie obrazovky
+// screen resolution
 #define WINDOW_SIZE_X 800
 #define WINDOW_SIZE_Y 600
 
diff --git a/src/base/path.h b/src/base/path.h
index ceea00e..b20c1f0 100644
--- a/src/base/path.h
+++ b/src/base/path.h
@@ -5,23 +5,27 @@
 
 #include "main.h"
 
+#ifndef PREFIX
+  #define PREFIX "/usr/local"
+#endif
+
 #ifndef PUBLIC_SERVER
-#define PATH_DIR		"share/tuxanci-ng/"
-#define PATH_MODULES DESTDIR	"lib/tuxanci-ng/"
+  #define PATH_DIR	PREFIX	"/share/tuxanci-ng/"
+  #define PATH_MODULES 	PREFIX	"/lib/tuxanci-ng/"
 #endif
 
 #ifdef PUBLIC_SERVER
-#define PATH_DIR		"share/tuxanci-ng-server/"
-#define PATH_MODULES DESTDIR 	"lib/tuxanci-ng-server/"
+  #define PATH_DIR	PREFIX	"/share/tuxanci-ng-server/"
+  #define PATH_MODULES	PREFIX	"/lib/tuxanci-ng-server/"
 #endif
 
-#define PATH_IMAGE	DESTDIR PATH_DIR "image/"
-#define PATH_FONT	DESTDIR PATH_DIR "font/"
-#define PATH_ARENA	DESTDIR PATH_DIR "arena/"
-#define PATH_SOUND	DESTDIR PATH_DIR "sound/"
-#define PATH_MUSIC	DESTDIR PATH_DIR "music/"
-#define PATH_CONFIG	DESTDIR PATH_DIR "conf/"
-#define PATH_LANG	DESTDIR PATH_DIR "lang/"
-#define PATH_DATA	DESTDIR PATH_DIR "doc/"
+#define PATH_IMAGE	PATH_DIR "image/"
+#define PATH_FONT	PATH_DIR "font/"
+#define PATH_ARENA	PATH_DIR "arena/"
+#define PATH_SOUND	PATH_DIR "sound/"
+#define PATH_MUSIC	PATH_DIR "music/"
+#define PATH_CONFIG	PATH_DIR "conf/"
+#define PATH_LANG	PATH_DIR "lang/"
+#define PATH_DATA	PATH_DIR "doc/"
 
 #endif
diff --git a/src/client/radar.c b/src/client/radar.c
index 6f6b028..49c72de 100644
--- a/src/client/radar.c
+++ b/src/client/radar.c
@@ -1,5 +1,6 @@
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "main.h"
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 5dd7fc1..a7eca81 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -322,7 +322,6 @@ void initScreenSetting()
 	label_count_round = newWidgetLabel(getMyText("COUNT_ROUND"), 100, WINDOW_SIZE_Y-200, WIDGET_LABEL_LEFT);
 	label_name_player1 = newWidgetLabel(getMyText("NAME_PLAYER1"), 100, WINDOW_SIZE_Y-160, WIDGET_LABEL_LEFT);
 	label_name_player2 = newWidgetLabel(getMyText("NAME_PLAYER2"), 100, WINDOW_SIZE_Y-120, WIDGET_LABEL_LEFT);
-	label_ai = newWidgetLabel("AI :", 430, 400, WIDGET_LABEL_LEFT);
 
 	textfield_count_cound = newWidgetTextfield(getParamElse("--count", "15"), 110+label_count_round->w, WINDOW_SIZE_Y-200);
 	
@@ -337,9 +336,12 @@ void initScreenSetting()
 		WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 	check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10,
 		WINDOW_SIZE_Y-80, isSoundActive() , eventWidget);
+	label_ai = newWidgetLabel("AI:", check_sound->x + WIDGET_CHECK_WIDTH + 10, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
+#elif
+	label_ai = newWidgetLabel("AI:", 100, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 #endif
 
-	check_ai = newWidgetCheck(460, 405, FALSE, eventWidget);
+	check_ai = newWidgetCheck(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y-80, FALSE, eventWidget);
 
 	for( i = GUN_DUAL_SIMPLE ; i <= GUN_BOMBBALL ; i++ )
 	{