From 0b46b4a8f07575138e9c2d5fb051834a8ecb9cd8 Mon Sep 17 00:00:00 2001 From: scarab Date: Tue, 19 Aug 2008 11:12:57 +0000 Subject: - jeste mensi upravy v arenaFile a cmake, drobna uprava predchoziho commitu git-svn-id: http://opensvn.csie.org/tuxanci_ng@225 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- CMakeLists.txt | 4 +--- src/base/arenaFile.c | 2 +- src/client/font.h | 3 ++- src/client/game.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adc8dde..8e08e27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,8 +161,6 @@ ENDIF ( WIN ) # SDL SEARCH ############################################################################### IF ( NOT Win ) - MESSAGE ( STATUS "" ) - MESSAGE ( STATUS "<******************************>" ) FIND_PACKAGE ( SDL REQUIRED ) FIND_PACKAGE ( SDL_image REQUIRED ) FIND_PACKAGE ( SDL_ttf REQUIRED ) @@ -200,7 +198,7 @@ ENDIF ( Bundle ) # GETTEXT SUPPORT ############################################################################### IF ( NLS ) - MESSAGE ( STATUS "" ) + MESSAGE ( STATUS "" ) MESSAGE ( STATUS "<******************************>" ) ADD_DEFINITIONS ( -DNLS ) SET ( GETTEXT_PACKAGE "tuxanci" ) diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c index b89e1c3..bd048b0 100644 --- a/src/base/arenaFile.c +++ b/src/base/arenaFile.c @@ -79,7 +79,7 @@ static void cmd_arena(arena_t **arena, char *line) //(*arena)->w = atoi(str_w); //(*arena)->h = atoi(str_h); setCurrentArena(*arena); -#ifndef DEBUG +#ifdef DEBUG printf(_("Loaded new arena...\n")); #endif } diff --git a/src/client/font.h b/src/client/font.h index cf8ece6..418cef3 100755 --- a/src/client/font.h +++ b/src/client/font.h @@ -15,7 +15,8 @@ #define COLOR_BLUE 0, 0, 255 #define COLOR_YELLOW 255, 255, 0 - +#define FONT_SIZE 16 +#define FONT_FILE "DejaVuSans.ttf" extern bool_t isFontInicialized(); extern void initFont(char *file,int size); extern void drawFont(char *s,int x,int y,int r,int g,int b); diff --git a/src/client/game.c b/src/client/game.c index b82dd4a..b0d2322 100644 --- a/src/client/game.c +++ b/src/client/game.c @@ -46,7 +46,7 @@ static void initGame() createHomeDirector(); initSDL(); - initFont("DejaVuSans.ttf", 16); + initFont(FONT_FILE , FONT_SIZE); initLayer(); initImageData(); #ifndef NO_SOUND -- cgit v1.2.3