diff options
| author | xHire <xhire@tuxportal.cz> | 2009-05-26 01:01:17 +0200 |
|---|---|---|
| committer | xHire <xhire@tuxportal.cz> | 2009-05-26 01:12:24 +0200 |
| commit | daa5951908a7228f88cfd1cbf1f0353389d98758 (patch) | |
| tree | 462b1d69a3d3ab573df213017f2cb09f1a2157ba /src | |
| parent | 53fdb78257cd4bf454f255deede74d8e98e752fb (diff) | |
Rectified the coding style in path.h.in
Fixed some old comments (//) and whitespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/path.h.in | 57 | ||||
| -rw-r--r-- | src/client/chat.c | 6 | ||||
| -rw-r--r-- | src/screen/setting.c | 2 |
3 files changed, 35 insertions, 30 deletions
diff --git a/src/base/path.h.in b/src/base/path.h.in index 7e3a7a6..afa4161 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -1,27 +1,32 @@ #ifndef PATH_H - #cmakedefine USE_MAGICK - #define TUXANCI_VERSION "@TUXANCI_VERSION@" - #define PATH_H - #define PREFIX "@CMAKE_INSTALL_PREFIX@" - #ifdef PUBLIC_SERVER - #define APPNAME "tuxanci-server" - #define SERVER_CONFIG "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" - #else - #define APPNAME "tuxanci" - #endif - #define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "/" - // windows bug - #ifndef __WIN32__ - #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "/" - #else - #define PATH_MODULES PREFIX - #endif - #define PATH_IMAGE PATH_DIR "images/" - #define PATH_ARENA PATH_DIR "arena/" - #define PATH_SOUND PATH_DIR "sound/" - #define PATH_MUSIC PATH_DIR "music/" - #define PATH_LOCALE "@CMAKE_LOCALE_PATH@" "/" - #define PATH_DOC "@CMAKE_DOC_PATH@" "/" - #define PACKAGE "tuxanci" - #include "main.h" -#endif +#define PATH_H + +#include "main.h" + +#cmakedefine USE_MAGICK +#define TUXANCI_VERSION "@TUXANCI_VERSION@" +#define PREFIX "@CMAKE_INSTALL_PREFIX@" +#ifndef PUBLIC_SERVER + #define APPNAME "tuxanci" +#else /* PUBLIC_SERVER */ + #define APPNAME "tuxanci-server" + #define SERVER_CONFIG "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" +#endif /* PUBLIC_SERVER */ +#define PATH_DIR "@CMAKE_DATA_PATH@" "/" APPNAME "/" + +/* windows bug */ +#ifndef __WIN32__ + #define PATH_MODULES "@LIB_INSTALL_DIR@" "/" APPNAME "/" +#else /* __WIN32__ */ + #define PATH_MODULES PREFIX +#endif /* __WIN32__ */ + +#define PATH_IMAGE PATH_DIR "images/" +#define PATH_ARENA PATH_DIR "arena/" +#define PATH_SOUND PATH_DIR "sound/" +#define PATH_MUSIC PATH_DIR "music/" +#define PATH_LOCALE "@CMAKE_LOCALE_PATH@" "/" +#define PATH_DOC "@CMAKE_DOC_PATH@" "/" +#define PACKAGE "tuxanci" + +#endif /* PATH_H */ diff --git a/src/client/chat.c b/src/client/chat.c index d4bdc14..d68edb8 100644 --- a/src/client/chat.c +++ b/src/client/chat.c @@ -239,10 +239,10 @@ static void chat_eventEnable() continue; /* continue with other keys */ } else { /* the chat row is empty - it is needed to turn off the chat window */ - //chat_eventDisable(); + /*chat_eventDisable();*/ /* turn off key catching into the buffer and clear the buffer */ - //interface_disable_keyboard_buffer(); - //keyboard_buffer_clear(); + /*interface_disable_keyboard_buffer();*/ + /*keyboard_buffer_clear();*/ } } diff --git a/src/screen/setting.c b/src/screen/setting.c index ceea876..2dadec7 100644 --- a/src/screen/setting.c +++ b/src/screen/setting.c @@ -347,7 +347,7 @@ void setting_init() check_music = check_new(label_music->x + label_music->w + 10, WINDOW_SIZE_Y - 80, music_is_active(), eventWidget); label_sound = label_new(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10, - WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); + WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); check_sound = check_new(label_sound->x + label_sound->w + 10, WINDOW_SIZE_Y - 80, sound_is_active(), eventWidget); |