diff options
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | include/path.h | 24 | ||||
| -rw-r--r-- | path_config.h | 2 | ||||
| -rwxr-xr-x | src/Makefile | 2 | ||||
| -rwxr-xr-x | src/Makefile-publicServer | 4 | ||||
| -rw-r--r-- | src/screen_world.c | 4 | ||||
| -rw-r--r-- | src/widget_button.c | 2 |
7 files changed, 20 insertions, 20 deletions
@@ -4,5 +4,5 @@ #define DEBUG_CLIENT_SEND #define DEBUG_CLIENT_RECV */ -#define DISTDIR "/usr/local/" +#define DESTDIR "/usr/local/" #define SUPPORT_NET_SDL_UDP diff --git a/include/path.h b/include/path.h index a51baa0..884e13e 100644 --- a/include/path.h +++ b/include/path.h @@ -5,28 +5,28 @@ #include "main.h" -#ifdef DISTDIR +#ifdef DESTDIR #define PATH_DIR "share/tuxanci-ng/" #endif -#ifndef DISTDIR +#ifndef DESTDIR #define PATH_DIR "./" -#undef DISTDIR -#define DISTDIR "" +#undef DESTDIR +#define DESTDIR "" #endif -#define PATH_IMAGE DISTDIR PATH_DIR "image/" -#define PATH_FONT DISTDIR PATH_DIR "font/" -#define PATH_ARENA DISTDIR PATH_DIR "arena/" -#define PATH_SOUND DISTDIR PATH_DIR "sound/" -#define PATH_MUSIC DISTDIR PATH_DIR "music/" -#define PATH_CONFIG DISTDIR PATH_DIR "conf/" -#define PATH_LANG DISTDIR PATH_DIR "lang/" -#define PATH_DATA DISTDIR PATH_DIR "data/" +#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 "data/" #endif diff --git a/path_config.h b/path_config.h index d4a9c3d..4bce76b 100644 --- a/path_config.h +++ b/path_config.h @@ -1,2 +1,2 @@ -#define DISTDIR "/usr/" +#define DESTDIR "/usr/local/" #define SUPPORT_NET_SDL_UDP diff --git a/src/Makefile b/src/Makefile index b740d40..7160cb5 100755 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ CC = gcc #CFLAGS = -O2 -DSUPPORT_NET_SDL_UDP -I../include -Wall `sdl-config --cflags` CFLAGS = -O2 -I../include -Wall `sdl-config --cflags` -#CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall +#CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall LIBS = `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net diff --git a/src/Makefile-publicServer b/src/Makefile-publicServer index 8c4f90f..e0a2a56 100755 --- a/src/Makefile-publicServer +++ b/src/Makefile-publicServer @@ -2,10 +2,10 @@ #CC = /usr/local/gcc/bin/gcc CC = gcc -DISTDIR:=/usr/ +DESTDIR:=/usr/local/ CFLAGS = -g -O0 -DBUBLIC_SERVER -DSUPPORT_NET_UNIX_UDP -I../include -Wall -#CFLAGS = -O2 -DDISTDIR=\"$(DISTDIR)\" `sdl-config --cflags` -I../include -Wall +#CFLAGS = -O2 -DDESTDIR=\"$(DESTDIR)\" `sdl-config --cflags` -I../include -Wall LIBS = diff --git a/src/screen_world.c b/src/screen_world.c index 60260b9..f9ef868 100644 --- a/src/screen_world.c +++ b/src/screen_world.c @@ -282,13 +282,13 @@ static void control_keyboard_right(tux_t *tux) actionTux(tux, TUX_DOWN); } - if( mapa[(SDLKey)SDLK_KP0] == SDL_PRESSED ) + if( mapa[(SDLKey)SDLK_LCTRL] == SDL_PRESSED ) { netAction(tux, TUX_SHOT); actionTux(tux, TUX_SHOT); } - if( mapa[(SDLKey)SDLK_KP1] == SDL_PRESSED ) + if( mapa[(SDLKey)SDLK_LSHIFT] == SDL_PRESSED ) { if( tux->isCanSwitchGun == TRUE ) { diff --git a/src/widget_button.c b/src/widget_button.c index 1024091..9a899b1 100644 --- a/src/widget_button.c +++ b/src/widget_button.c @@ -47,7 +47,7 @@ void drawWidgetButton(widget_button_t *p) drawImage(g_button0, p->x, p->y, 0, 0, g_button0->w, g_button0->h); } - drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2, COLOR_WHITE); + drawFont(p->text, p->x+WIDGET_BUTTON_WIDTH/2-p->w/2, p->y+p->h/2-6, COLOR_WHITE); } void eventWidgetButton(widget_button_t *p) |