Merge branch 'master' of ssh://oroborus@repo.or.cz/srv/git/tuxanci

7 files changed, 5 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f283d42..e9e4353 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@
 # -DLIB_INSTALL_DIR=/other/bla	# install path for lib
 # -DCMAKE_DOC_PATH=/other/bla/doc/tuxanci-version/	# install path for doc
 # -DCMAKE_LOCALE_PATH=/other/bla	# install path for locale
-# -DCMAKE_FONT=/bla/font.ttf	# install path for locale
 ###############################################################################
 # DEFAULT OPTIONS
 ###############################################################################
@@ -61,7 +60,6 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} )
 # this specify location of additional cmake sources
 SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
 #various variables
-SET ( CMAKE_FONT "${CMAKE_DATA_PATH}/${APPNAME}/font/DejaVuSans.ttf" CACHE PATH "Font" )
 SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
 SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" )
 SET ( CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" )
@@ -194,7 +192,6 @@ INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README
 MESSAGE ( STATUS "<Printing out environment settings>" )
 MESSAGE ( STATUS "<******************************>" )
 MESSAGE ( STATUS "CFlags: ${CMAKE_C_FLAGS}" )
-MESSAGE ( STATUS "Font: ${CMAKE_FONT}" )
 MESSAGE ( STATUS "PREFIX: ${CMAKE_INSTALL_PREFIX}" )
 MESSAGE ( STATUS "ETC directory: ${CMAKE_CONF_PATH}" )
 MESSAGE ( STATUS "DOC directory: ${CMAKE_DOC_PATH}" )
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 53bb7d7..f808d92 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -5,7 +5,6 @@
 ###############################################################################
 ADD_SUBDIRECTORY ( arena )
 ADD_SUBDIRECTORY ( conf )
-ADD_SUBDIRECTORY ( font )
 ADD_SUBDIRECTORY ( images )
 ADD_SUBDIRECTORY ( music )
 ADD_SUBDIRECTORY ( sound )
diff --git a/data/font/CMakeLists.txt b/data/font/CMakeLists.txt
deleted file mode 100644
index c2d6a83..0000000
--- a/data/font/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# tuxanci/data/font/CMakeLists.txt
-###############################################################################
-# DIRECTORIES
-###############################################################################
-# nada :P
-###############################################################################
-# CURRENT DIRECTORY FILES
-###############################################################################
-IF ( NOT Server )
-	FILE ( GLOB files "*.ttf" )
-	IF ( "${CMAKE_FONT}" STREQUAL "${CMAKE_DATA_PATH}/${APPNAME}/font/DejaVuSans.ttf" )
-		INSTALL ( FILES ${files}
-			DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/font/ )
-	ENDIF ( "${CMAKE_FONT}" STREQUAL "${CMAKE_DATA_PATH}/${APPNAME}/font/DejaVuSans.ttf" )
-ENDIF ( NOT Server )
-###############################################################################
diff --git a/data/font/DejaVuSans.ttf b/data/font/DejaVuSans.ttf
deleted file mode 100644
index cc767e6..0000000
--- a/data/font/DejaVuSans.ttf
+++ /dev/null
diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild
index 4ecdf3b..480b46b 100644
--- a/packaging/gentoo/tuxanci-9999.ebuild
+++ b/packaging/gentoo/tuxanci-9999.ebuild
@@ -23,7 +23,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dedicated ipv6 nls opengl"
 # alsa is used only when building client
 
-RDEPEND="!dedicated? (
+RDEPEND="
+	!dedicated? (
+		media-libs/fontconfig
 		media-libs/libsdl[X,opengl?]
 		media-libs/sdl-ttf[X]
 		media-libs/sdl-image[png]
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 117851a..2f58513 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -333,12 +333,12 @@ static void loadArenaFromDirector(char *director)
 	director_t *p;
 	int i;
 
-	printf(_("Load arena file from %s\n"), director);
+	DEBUG_MSG(_("Loading arena files from %s\n"), director);
 	p = loadDirector(director);
 
 	if (p==NULL)
 	{
-		fprintf(stderr, _("Director %s not found !\n"), director);
+		fprintf(stderr, _("Directory %s not found !\n"), director);
 		exit(-1);
 	}
 
diff --git a/src/base/path.h.in b/src/base/path.h.in
index df8fa39..79bce33 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -18,7 +18,6 @@
 		#define PATH_MODULES 	PREFIX
 	#endif
 	#define PATH_IMAGE	PATH_DIR	"images/"
-	#define FONT_FILE	"@CMAKE_FONT@"
 	#define PATH_ARENA	PATH_DIR	"arena/"
 	#define PATH_SOUND	PATH_DIR	"sound/"
 	#define PATH_MUSIC	PATH_DIR	"music/"